Fix some issues with the variants.