More tweaks for windows