Further font fixes