Fix potential issues in data model