SLICE-2 fixes and refactors