Additional tweaks for Windows