fixes for Messages snippets