Added fixes for 2.8 support