Some other Compile Fixes