OSX clang fixes