Typographic and semantic fixes