[CLC-2358] Fixes