Fix for Xcode 6 compilation.
Round 5 fixes.