Fix snippets path and other snippets improvements