Apple bug fixes