2.10 fixes
more 2.10 fixes