Changes for Mac OS