FlatUCFRBuilder fix and dict generators