[fts] More patch fixes