Fix child ordering assumptions