Getting ready for 3.9