[DF-185] small changes