Fixes to maintain connection with ancestor