Fix errors and single parent birth flows