diff --git a/tbsetup/snmpit_test/snmpit_remote.pm.in b/tbsetup/snmpit_test/snmpit_remote.pm.in
index 0412cfb469d5acb60fd228576b30dc573d6f6e09..22291d2faa27d4fa632eb09ba42d8bffa0dc22d3 100644
--- a/tbsetup/snmpit_test/snmpit_remote.pm.in
+++ b/tbsetup/snmpit_test/snmpit_remote.pm.in
@@ -207,7 +207,7 @@ sub RemoteDoVlansFromTables($@)
 	    my $vlan = $vlans{$vlanid};
 
 	    #
-	    # This is should always succeed since we do whatever the
+	    # This should always succeed since we do whatever the
 	    # outer emulab says to do.
 	    #
 	    if (! ($vlan->HasVlanTagReserved($tag) ||
@@ -252,7 +252,8 @@ sub RemoteDeleteVlan($$)
     my $vlan      = shift();
     my $cleartags = shift();
 
-    return RemoteDoReset(undef, 0, $cleartags, ($vlan->id()));
+    return RemoteDoReset(undef, 0, $cleartags,
+			 (ref($vlan) ? $vlan->id() : $vlan));
 }
 
 #
@@ -278,7 +279,7 @@ sub RemoteDoReset($$$@)
 	if ($response->{"code"});
 
     foreach my $vlan (@vlans) {
-	clearReservedVlanTag($vlan)
+	VLan::ClearReservedVlanTag($vlan)
 	    if ($cleartags);
 	VLan->RecordVLanDeletion($vlan);
     }
diff --git a/tbsetup/snmpit_test/snmpit_test.in b/tbsetup/snmpit_test/snmpit_test.in
index 5193a90a2d054e009610d7437cb829217a7f2f43..8e54ff0468c896548fd6ad63d9a41b70aed0dc02 100755
--- a/tbsetup/snmpit_test/snmpit_test.in
+++ b/tbsetup/snmpit_test/snmpit_test.in
@@ -3466,7 +3466,7 @@ sub doDeleteVlan($@) {
     if ($ELABINELAB) {
 	foreach my $vlan (values(%vlans)) {
 	    if (RemoteDeleteVlan($vlan, $opt{C}) == 0) {
-		if ($vlan->Destroy() != 0) {
+		if (ref($vlan) && $vlan->Destroy() != 0) {
 		    print STDERR "*** Could not destroy $vlan\n";
 		}
 	    }