Getting ready for 1.7