Update for Xcode6b4 stricter checking