Updates to build with latest LLVM/Clang