Fix energy and fuel use