Fixed all HEC issues