important crash fixes
Important crash fixes