Final 2.8 fixes