Misc iPad-related fixes