Minor changes almost ready for 1.2