Final fixes for iPhone use