[WIP] Insight fixes