Fix articles, templates