Minor fixes to isolating the snippets PR