Please add these fixes for windows