Consolidated mac related changes