Getting ready for 1.2