Neo Snippet fixes