[DF-951] More fixes