OSX fixes
OSX fixes