llvm: Improve and fix