Merge: Fix warnings from clang on OS X