Crash improvements