DO NOT MERGE: Fixing Entities