CLDIDE-1931: add some fixes