Fix various errors found while building the site.
Merge pull request #2628 from waywardmonkeys/site-fixes

Fix various errors found while building the site.