Small fixes to the data model.