More font fixing