change 2.7 fixes