diff --git a/mmdebstrap b/mmdebstrap
index 730bd1a..6588917 100755
--- a/mmdebstrap
+++ b/mmdebstrap
@@ -2865,7 +2865,7 @@ sub run_install() {
                 '--format', '$(URI)', 'Created-By: Packages')
               or error "cannot start apt-get indextargets: $!";
             while (my $uri = <$pipe_apt>) {
-                if ($uri =~ /^https:\/\//) {
+                if ($uri =~ /^(mirror\+)?https:\/\//) {
                     info "https mirror found -- adding apt-transport-https "
                       . "and ca-certificates";
                     # FIXME: support for https is part of apt >= 1.5
@@ -3081,8 +3081,15 @@ sub run_cleanup() {
         # apt since 1.6 creates the auxfiles directory. If apt inside the
         # chroot is older than that, then it will not know how to clean it.
         if (-e "$options->{root}/var/lib/apt/lists/auxfiles") {
-            rmdir "$options->{root}/var/lib/apt/lists/auxfiles"
-              or die "cannot rmdir /var/lib/apt/lists/auxfiles: $!";
+            remove_tree("$options->{root}/var/lib/apt/lists/auxfiles",
+                    { error => \my $err });
+            if (@$err) {
+                for my $diag (@$err) {
+                    my ($file, $message) = %$diag;
+                    if ($file eq '') { warning "general error: $message"; }
+                    else { warning "problem unlinking $file: $message"; }
+                }
+            }
         }
     }