Fixes for LLVM-3.5