iOS7-related fixes