diff --git a/collects/tests/mzscheme/basic.ss b/collects/tests/mzscheme/basic.ss
index dfc4bc2d47..5d04571a49 100644
--- a/collects/tests/mzscheme/basic.ss
+++ b/collects/tests/mzscheme/basic.ss
@@ -1360,7 +1360,7 @@
 (map-tests andmap)
 (map-tests ormap)
 
-(test-values '(1 2) (lambda () (for-each (lambda (x) (values 1 2)) '(1 2))))
+(test-values (list (void)) (lambda () (for-each (lambda (x) (values 1 2)) '(1 2))))
 (err/rt-test (map (lambda (x) (values 1 2)) '(1 2)) arity?)
 
 (test #t andmap add1 null)
diff --git a/doc/release-notes/mzscheme/HISTORY b/doc/release-notes/mzscheme/HISTORY
index 693700e4c3..2fae0dfe29 100644
--- a/doc/release-notes/mzscheme/HISTORY
+++ b/doc/release-notes/mzscheme/HISTORY
@@ -23,8 +23,8 @@ Filesystem:
   link guard procedure
 Misc:
  Removed write-image-to-file and read-image-from-file
- for-each, ormap, and andmap now tail-apply the given function
-  for the last call
+ ormap and andmap now tail-apply a given function for the 
+  last list element(s)
  eval evaluates its argument in tail position
  Improved compilation of call-with-values and an immediate
   lambda argument to avoid closure creation
diff --git a/src/mred/wxme/wx_snip.cxx b/src/mred/wxme/wx_snip.cxx
index b849458365..6b8edb2b2d 100644
--- a/src/mred/wxme/wx_snip.cxx
+++ b/src/mred/wxme/wx_snip.cxx
@@ -1581,7 +1581,14 @@ void wxImageSnip::Copy(wxImageSnip *newSnip)
   newSnip->viewh = viewh;
   newSnip->viewdx = viewdx;
   newSnip->viewdy = viewdy;
+
   newSnip->bm = bm;
+  newSnip->mask = mask;
+
+  if (bm)
+    bm->selectedIntoDC++;
+  if (mask)
+    mask->selectedIntoDC++;
 }
 
 char *wxImageSnip::GetFilename(Bool *rel)
diff --git a/src/mzscheme/src/network.c b/src/mzscheme/src/network.c
index 7fdf853f79..e6c5fc132f 100644
--- a/src/mzscheme/src/network.c
+++ b/src/mzscheme/src/network.c
@@ -2442,8 +2442,6 @@ int scheme_get_port_socket(Scheme_Object *p, long *_s)
       }
     }
   } else if (SCHEME_INPORTP(p)) {
-    /* Abandon is not really useful on input ports from the Schemer's
-       perspective, but it's here for completeness. */
     Scheme_Input_Port *ip;
     ip = (Scheme_Input_Port *)p;
     if (ip->sub_type == scheme_tcp_input_port_type) {
diff --git a/src/mzscheme/src/schmap.inc b/src/mzscheme/src/schmap.inc
index 4e81c35232..0c03b417eb 100644
--- a/src/mzscheme/src/schmap.inc
+++ b/src/mzscheme/src/schmap.inc
@@ -105,11 +105,13 @@ DO_MAP(int argc, Scheme_Object *argv[])
     v = _scheme_apply(argv[0], argc, args);
 #else
 # ifdef FOR_EACH_MODE
+#  if 0
+    /* Last in tail position (currently disabled): */
     if (pos + 1 == size) {
       return _scheme_tail_apply(argv[0], argc, args);
-    } else {
-      _scheme_apply_multi(argv[0], argc, args);
     }
+#  endif
+    _scheme_apply_multi(argv[0], argc, args);
 # else
     if (pos + 1 == size) {
       return _scheme_tail_apply(argv[0], argc, args);