Fix Compile errors