Fix warning/discover