Fixed Insight issues