Updates according to llvm changes