Patching with James Bigler's windows fixes