More OS X clang 5.1 fixes