Compiler error fixes