more win fixes