Possible Last Round of iOS7 Compatibility fixes before submission