[CLC-1369] More fixes