Fixes to crash recovery..