Context and notice fixing for 2.7