GATEWAY-3247: updates to work on windows