A few changes now that we support fonts