Compiler fixes for OSX.