Snippet Fixes

Fix some samples to use latest patterns