Mods to some snippets