Added support for non-osx installs