small snippets fixes