small changes to use HaddHelpers on EE