General snippets fixes