PLINK-130 more fixes for complex identity model entity classes