Fix handling of exit return codes
Fixup interrupt handling