various changes for Mac