diff --git a/src/cmds.c b/src/cmds.c
index 7a575ae7348..ccc68911624 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -264,7 +264,7 @@ because it respects values of `delete-active-region' and `overwrite-mode'.  */)
 
   CHECK_NUMBER (n);
 
-  if (abs (XINT (n)) < 2)
+  if (eabs (XINT (n)) < 2)
     remove_excessive_undo_boundaries ();
 
   pos = PT + XINT (n);
diff --git a/src/font.c b/src/font.c
index ce144e78a08..a52a653d29b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1770,7 +1770,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
       p1 = strchr (p0, '-');
       if (! p1)
 	{
-	  AUTO_STRING (extra, ("*-*" + (len && p0[len - 1] == '*')));
+	  AUTO_STRING (extra, (&"*-*"[len && p0[len - 1] == '*']));
 	  registry = concat2 (registry, extra);
 	}
       registry = Fdowncase (registry);