fix a couple more win32 issues