More font issue fixing