[CLC-2409] Fixes