fixes for LLVM 3.5