Fix remaining entities.