Improvements to auto-fetch