Index: /devel/pb/bin/pb
===================================================================
--- /devel/pb/bin/pb	(revision 129)
+++ /devel/pb/bin/pb	(revision 130)
@@ -421,5 +421,7 @@
 	}
 	my $basesrc = "";
-	$basesrc = map { $basesrc." ".basename($_) } split(/ /,$src);
+	foreach my $i (split(/ /,$src)) {
+		$basesrc =. " ".basename($_);
+	}
 
 	print $LOG "Sources handled ($cmt): $src\n" if ($debug >= 0);
@@ -431,4 +433,6 @@
 	} elsif ($cmt eq "VMs") {
 		$tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}");
+		# Expand a potential $ENV{'HOME'}
+		eval { $tdir =~ s/(\$ENV.+\})/$1/eeg };
 	} elsif ($cmt eq "Packages") {
 		$tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";