Moar OSX fixes