Cleanups around crashing