Improved support for mac