llvm: Improve and fix

@maverickwoo @nojb Does this fix your problems ?