various fixes for sld6