More fixes for iphone