CLDIDE-1781: add some fixes