[DF-4113] small fixes.