this contains the fixes by Dario to workaround some of the quirks of EOS