Merged OSX fixes.