Fix Insight violations