diff --git a/app/xclock/Clock.c b/app/xclock/Clock.c
index 6611fd2be..bb422031c 100644
--- a/app/xclock/Clock.c
+++ b/app/xclock/Clock.c
@@ -831,7 +831,9 @@ RenderTextBounds(ClockWidget w, char *str, int off, int len,
     else
 #endif
     {
- fallback:
+#if defined(HAVE_ICONV) && defined(HAVE_NL_LANGINFO)
+    fallback:
+#endif
         XftTextExtents8(XtDisplay(w), w->clock.face, (FcChar8 *) str,
                         off, &head);
         XftTextExtents8(XtDisplay(w), w->clock.face, (FcChar8 *) str + off,
diff --git a/app/xclock/xclock.c b/app/xclock/xclock.c
index 7ee88b63e..c62750d54 100644
--- a/app/xclock/xclock.c
+++ b/app/xclock/xclock.c
@@ -231,10 +231,9 @@ main(int argc, char *argv[])
     {
         /* force reading of XErrorDB into memory to avoid adding "rpath" to 
            pledge below */
-        int r;
         char buf[1];
         
-	r = XGetErrorDatabaseText(XtDisplay(toplevel), "XProtoError", "0", "",  buf, 1);
+	(void)XGetErrorDatabaseText(XtDisplay(toplevel), "XProtoError", "0", "",  buf, 1);
     }
     if (pledge("stdio", NULL) == -1)
 	    err(1, "pledge");