Fixed up Energy checks (except Fonseca)