Added back lost conditionals for win/osx