Misc fixes to child registration