[DF-1317][DF-1318] Fixed for issues