Branding fixes
More branding fixes