Fix up all model spec Fixes #2