Minor fixes to debugging code.

db/Experiment.pm.in

@@ -2841,7 +2841,7 @@ sub CleanLogFiles($)
     }
     mysystem("/bin/rm -f @delete") == 0
 	or return -1;
-    mysystem("/bin/rm -rf ${workdir}/vstate.* ${workdir}/pstate.*") == 0
+    mysystem("/bin/rm -rf ${workdir}/vstate* ${workdir}/pstate*") == 0
 	or return -1;
 
     return 0;
@@ -3234,8 +3234,12 @@ sub SaveBackupState($)
     my $pstateDir = $workdir . "/pstate";
     my $vstateDir = $workdir . "/vstate";
 
+    system("/bin/rm -rf ${pstateDir}-prev")
+	if (-e "${pstateDir}-prev");
     system("/bin/cp -Rfp $pstateDir ${pstateDir}-prev")
 	if (-e $pstateDir);
+    system("/bin/rm -rf ${vstateDir}-prev")
+	if (-e "${vstateDir}-prev");
     system("/bin/cp -Rfp $vstateDir ${vstateDir}-prev")
 	if (-e $vstateDir);
 

tbsetup/swapexp.in

@@ -1584,7 +1584,7 @@ sub cleanup()
     #
     if (1) {
 	# Maybe use a feature?
-	system("/bin/cp -Rfp $workdir ${workdir}-failed");
+	system("/bin/cp -Rfp $workdir/ ${workdir}-failed");
     }
     else {
 	system("/bin/rm -rf  ${workdir}-failed");