Fix up model