fixes for non-osx hosts