Hcal relval fixes

Resubmit previous fixes in 73X IB (refer to PR  #5379).