Addressed LLVM 5 issues