Minor tweaks to the windows check