WEBCMS-24 - Minor updates