Updates for 1.6.x