CHERKASY-61 small fixes following PR remarks