Markup tweaks

Fixes some markup issues.