Correct Heat related endpoints