CB-7774 some corrections per feedback