Fixes to support new Marlin version