More fixes for Insight