Final font fixes

Hopefully