Final fixes for hepz