more tweaks to the windows support