Fix bugs (nunjucks and others)