Fixing context problems