Catch up with LLVM changes