[FIX] Fix some issue with XML snippets