Fix the Windows build for 2.1