Few changes to some snippets