Fix up other exit points. Should stop process hangs for clean exits.