Fix small bugs. Refs #6965
Merge branch 'feature/6965_wiki_links' into develop