Added windows workarounds
Merge remote-tracking branch 'randomgc/windows'