Fixed a few energy transfer issues