Mac-related changes