Fixing SOME compile errors