Fix snippet issues