Final fixes for 1.2.0