NO-JIRA: Windows fixes for previous  "simple" change