Updates for working build on Windows