COOPR-589: minor fixes