fixes for Chat2.0 snippets