More compile fixes for Xcode 5 on Mac OS X 10.9.