Apply a couple of patches at the start of the Windows build. (dm)