Fixed SLInsight issues^2