Fix font support