Fixes for iPhone