Compile errors: fix compile issues