CLDIDE-1931: add small fixes