Minor fixes in crash handler