Fix win32 build & branding