Fix mark and model_auto models