Fixups for iOS7