Fix final issues with birth flows