Updated handling of fonts