Hyphenation fixes