Small changes in preparation for iOS7