Fixed issues in the templates being outdated