BRID-179 BRID-180 Minor Entity corrections