[CLC-1191] Fixes