Snippet fixes