Work towards better font support