COOPR-520: fixed minor issues