Fix font  conflicts