patches to tokenization and execution pipelines