some changes for Mac