[CLC-1188] More fixes from Jon