working on osx fixes