Fixed crash detection

and friends