Fixes for bsm_prefetch "criticals"