More 2.6 updates