more support for windows and SLES machines