Corrected windows scripts to match their shell counterparts.

Sync of windows script with shell counterparts