changes for mac support