Fuel Tank Fixes