more attempted llvm fixings