Update for new iOS 7 api
Fix conflicts