CB-5005 rest of the doc fixes