Fix some 2.8 early issues