Win32 fix after merge.