Windows Bugfixes 2

Retried with a different method.