OSX Build Fixes