Fixing the Windows builds. Re #863