Fixes issue with building on Windows
Fixes another bug in Windows build