Various iPhone fixes (hopefully)