Minor changes to font routines.