COOPR-520: minor fixes