More robust handling of font adjustments