[Typer] [Git][monnier/typer][soilih] fixing context errors