[DF-4233] small fixes