Compiler crash fixes