Some tweaks to snippets