fixes to crash dump