minor bug fixes for messages