More fixes for context