fix several snippets