Minor changes to fetch