Misc font fixes

Mostly picked from #1321. Thx @rszaloki!