LLVM 5.0 / OSX 10.9 fixes

Small fixes for cleaner building on OS X 10.9