More tentative apple fixes.