Some changes to make all the fonts work as expected