Some modifications due to fonts.