[DF-31] Fixes for Win32