Iphone 4 fixes