Updates to font handling