Improve messages slightly