some 2.6 fixes