WIP fix slabs