[DF-4326] Fixed bugs