[DF-3486] Fixed number of small issues