More precise warnings
Simplify log display