Fix parent / child relationships