typo fixes - rebased

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?
Full results can be found at
https://testbot.winehq.org/JobDetails.pl?Key=6325

Your paranoid android.


=== w2000pro (32 bit shlfileop) ===
Failure running script in VM: network read timed out (wait2:ListSize:0/4)