More 2.6 stuff