Font refactor fixes