More maintenance in fonts/AFM and fonts/OTF