win-related minor fixes