Fixes: #1887 Fixes code style small errors
Fixes: #2575 Improved display of error warning header