Energy issues fixed