Fix up TE logic and recipe storage