Minor progress for 1.6 update