Improve connection message a bit