Slicing fixes