diff --git a/database/DBcellsrch.c b/database/DBcellsrch.c
index a960bf2e..d3eaa667 100644
--- a/database/DBcellsrch.c
+++ b/database/DBcellsrch.c
@@ -581,8 +581,11 @@ DBTreeSrLabels(scx, mask, xMask, tpath, flags, func, cdarg)
 	    else
 		is_touching = GEO_TOUCH(&lab->lab_rect, r);
 	}
-	if (!is_touching && (flags & TF_LABEL_DISPLAY) && (lab->lab_font >= 0))
+	if (!is_touching && (flags & TF_LABEL_DISPLAY) && lab->lab_font >= 0)
+	{
+	    /* Check against bounds of the rendered label text */
 	    is_touching = GEO_TOUCH(&lab->lab_bbox, r);
+	}
 
 	if (is_touching && TTMaskHasType(mask, lab->lab_type))
 	    if ((*func)(scx, lab, tpath, cdarg))
diff --git a/dbwind/DBWdisplay.c b/dbwind/DBWdisplay.c
index 8ea1b3bd..0ccb80ea 100644
--- a/dbwind/DBWdisplay.c
+++ b/dbwind/DBWdisplay.c
@@ -418,7 +418,7 @@ DBWredisplay(w, rootArea, clipArea)
         /* Set style information beforehand */
         GrSetStuff(STYLE_LABEL);
 	(void) DBTreeSrLabels(&scontext, &DBAllTypeBits, bitMask,
-		(TerminalPath *) NULL, TF_LABEL_DISPLAY,
+		(TerminalPath *) NULL, TF_LABEL_DISPLAY | TF_LABEL_ATTACH,
 		dbwLabelFunc, (ClientData) NULL);
 	GrClipTo(&rootClip);
     }
diff --git a/tcltk/wrapper.tcl b/tcltk/wrapper.tcl
index 563778d5..271d2cd6 100644
--- a/tcltk/wrapper.tcl
+++ b/tcltk/wrapper.tcl
@@ -629,7 +629,7 @@ proc magic::cursorview {win} {
       return
    }
    set framename [winfo parent $win]
-   if {[catch {set cr [cif scale out]}]} {return}
+   if {[catch {set cr [*bypass cif scale out]}]} {return}
    if {$cr == 0} {return}
    set olst [${win} cursor internal]