Fix the HEK_HELIO branch

I believe this addresses all the points on the outstanding PR #645