Fix up a couple models