Compile fixes for Xcode6/10.10 SDK