[DF-4297] - Win32 changes.