Fix branding and warning about static data