diff --git a/BootRoot/BootRoot.pm b/BootRoot/BootRoot.pm
index dccb709..e958f80 100644
--- a/BootRoot/BootRoot.pm
+++ b/BootRoot/BootRoot.pm
@@ -855,8 +855,19 @@ if ( $option{"uml-exclusively"} ) {
     : ($uml_exclusively = 0);
 }
 
+my $preserve_ownership = 0;  # assume no
+if ( $option{"preserve-ownership"} ) {
+    $option{"preserve-ownership"} eq "y" 
+    ? ($preserve_ownership = 1)
+    : ($preserve_ownership = 0);
+}
+
+
+
 $ars->{uml_exclusively} = $uml_exclusively;
 ars2($ars);  #not used in function below    
+$ars->{preserve_ownership} = $uml_exclusively;
+ars2($ars); 
 
 # links_deps()
 # Good defaults
@@ -918,7 +929,7 @@ if ( $method eq "yard" ) {
 
 ######################################################
 
-}  # end if $::commandline
+}  # end if !$::commandline
 
 } # end start
 
diff --git a/BootRoot/Yard.pm b/BootRoot/Yard.pm
index 2bd3054..bc57d20 100644
--- a/BootRoot/Yard.pm
+++ b/BootRoot/Yard.pm
@@ -1542,6 +1542,10 @@ sub create_expect_uml {
 	    while (<EXPECT>) {
 		info(1,"$x_count  $_");
 		$x_count++;
+		# Didn't need this before, but now do.
+		if ( $_ =~/nbd.*module cleaned up/ ) {
+		    last;
+		}
 		while (Gtk->events_pending) { Gtk->main_iteration; }
 	    }