More iPhone fixes