Two more Insight fixes