CB-7774 minor corrections