Further OSX fixes