Various context improvements