More bad uses of variants fixed