Sync with recent changes in fuel-main