More tweaks following branding changes.