Updates for 1.7