Fix variant and model saving.