[DF-3955] - Code Review, Win32 changes.