[DF-3732] small fixes