Fixes for Clang 5.1 on OSX 10.9