Updated for llvm 3.5

Minor changes for llvm 3.5 compatibility.