win32: fix accidental rename and compiler warnings