Fixing bugs in windows deployment