Slc improvements

@wichert: please review