[RFR] Insight fixes