Snippet tweaks