Properly fix font changes