5391d29 Initial IOS8 fixes