Minor tweaks for building on clang on OS X