Fixed Fuel bugs