Crash recovery tweaks