Some win bugs fix