Updates for xcode5/ios7