Tweaking some more snippets