Compile errors fixed