[DF-1619] Win32 changes.