[CLC-2506] Fixes