More improvements to font parsing