3.20 - win32 build fixes