Some prior tweaks for Windows