TEIIDDES-2295 Fixes several windows specific issues
Merge pull request #396 from mdrillin/TEIIDDES-2295

TEIIDDES-2295 Fixes several windows specific issues