Further work on mb_spill