Adoptee list number and create by fixes