Fixing some insights-raised issues