[DF-2446] Fix dava tools