Compile error fixes