Snippet bugs fixed