CLDIDE-1833: add some fixes