First update fixing M2.7 deprecation stuff