Small fixes to build.
Typer infers original text.