Context fixes for 2.7