- OSX fixes