Frontmatter fixes