More progress towards 1.7