Fix various metadata support page issues

Also, include the metadata support pages in the TOC.