Changes for OSX Compile