Fixing up the entities