More bug fixes for CleanSLClasses