Fixes for iPhone system