Corrections to compile with clang on Mavericks