More tweaks to pre-fetching