ECL-237 small fixes