Patch yet more ios7 assumptions