Updates for 2.7