[Bug 434509] Adjust variables for signal handlers