More changes getting ready for 1.2.3.