more 2.6 fixes