Multiple fixes to snippet regressions