Improve diagnostic messages and notfications