Reducing fuel related issues