Fixes to crash recovery.