Fixed some slight conflicts in SLICE_ALT mode after merging from next.