Fixes concerning backwards compatibility in com:account & com:cms.