Improved mac integration.