Fixes to the data model.