More fixes to font adjustment