diff --git a/src/normal.c b/src/normal.c
index 12d4ffc..84de270 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5834,10 +5834,6 @@
 	t_cmd = FALSE;
 
     cap->oap->motion_type = MCHAR;
-    if (cap->arg == BACKWARD)
-	cap->oap->inclusive = FALSE;
-    else
-	cap->oap->inclusive = TRUE;
     if (IS_SPECIAL(cap->nchar) || searchc(cap, t_cmd) == FAIL)
 	clearopbeep(cap->oap);
     else
diff --git a/src/spell.c b/src/spell.c
index 8f8c892..2562e4b 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -11293,6 +11293,7 @@
 
 /*
  * Function given to qsort() to sort the suggestions on st_score.
+ * First on "st_score", then "st_altscore" then alphabetically.
  */
     static int
 #ifdef __BORLANDC__
@@ -11307,7 +11308,11 @@
     int		n = p1->st_score - p2->st_score;
 
     if (n == 0)
-	return p1->st_altscore - p2->st_altscore;
+    {
+	n = p1->st_altscore - p2->st_altscore;
+	if (n == 0)
+	    n = STRICMP(p1->st_word, p2->st_word);
+    }
     return n;
 }