[fts] More patch fixing