Minor tweaks to the Windows support changeset