Fix code for Xcode6-GM.