[CLC-1230] Fixes