Misc font fixes
Merge pull request #1513 from tobytailor/nat

Misc font fixes