More fixes to context