Compiler fixes for Clang 6.0 under Mac OS X 10.10