Housekeeping changes for iOS7 and mavericks