Prefetching behavior fixes