Updates to build for LLVM/Clang 3.5