More iPhone fixes.