Changes to support fuel consumption conversions