more OSX fixes