Many fixes to parent data handling