Made changes to comply with Xcode6-GM