Fixed slab stuff
Merging branches