Fixes for iphone