Small fixes
Merge pull request #7032 from guardian/commercial-comp-fixes

Small fixes to commercial components.