Fix compile errors in Xcode 6 b5.