More 2.6 fixes