Miscellaneous iOS fixes