Further fixes to font names