More OSX fixes