Changes for OSX