More font fixes