First pass at iOS 7 support