- win32 build fixes