More work towards 1.2.0