Begin fixing the font code