Fixes for Windows
More fix