Fix up some model