Some changes to the font handling