A few OSX fixes.