changes to adapt OSX environment