Committing mac fixes