Remove warning
Improve reporting, make validator less windy