Fixed some 2.8 compatibility issues