Modifications for OSX