re: Corrections for signal handlers