iOS 7 Support

Bug fixes