Fix font variables after merge.