fixes to assign parent