Updates for XCode5 and iOS7