manually apply Windows patch fixes from refactoring script

This just manually applies the patches from !1 from Refactoring-Script needed to fix Compilation under Windows.