Some changes to prepare for iOS 7 (more to come!)