Fixes to font adjustment