More changes related to fonts