Merge fixes for Win32.