Getting ready for 2.6