Add two patches that are needed for the Windows build. (st)