Fix branding issues