More insight fixes