Some additional snippets

I committed them separately so that you can pick up whichever you believe are more appropriate.