Some fixes related to the new font