Mac support changes