ECL-242 small fixes, part 2