More snippet fixes.