diff --git a/lib/widget/input_complete.c b/lib/widget/input_complete.c
index 837db0ab9..0de96186d 100644
--- a/lib/widget/input_complete.c
+++ b/lib/widget/input_complete.c
@@ -1030,7 +1030,6 @@ query_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
                 input_handle_char (input, parm);
                 h->ret_value = B_USER;
                 dlg_stop (h);
-                return MSG_HANDLED;
             }
             else
             {
@@ -1070,7 +1069,6 @@ query_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
                 /* This means we want to refill the list box and start again */
                 h->ret_value = B_USER;
                 dlg_stop (h);
-                return MSG_HANDLED;
             }
             else
             {
@@ -1165,9 +1163,8 @@ query_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
                 }
                 bl = 0;
             }
-            return MSG_HANDLED;
         }
-        break;
+        return MSG_HANDLED;
 
     default:
         return dlg_default_callback (w, sender, msg, parm, data);
diff --git a/m4.include/mc-cflags.m4 b/m4.include/mc-cflags.m4
index 76540a5ec..973189d93 100644
--- a/m4.include/mc-cflags.m4
+++ b/m4.include/mc-cflags.m4
@@ -85,6 +85,7 @@ dnl    MC_CHECK_ONE_CFLAG([-Wstrict-aliasing])
     MC_CHECK_ONE_CFLAG([-Wtype-limits])
     MC_CHECK_ONE_CFLAG([-Wundef])
     MC_CHECK_ONE_CFLAG([-Wuninitialized])
+    MC_CHECK_ONE_CFLAG([-Wunreachable-code])
     MC_CHECK_ONE_CFLAG([-Wunused-but-set-variable])
     MC_CHECK_ONE_CFLAG([-Wunused-function])
     MC_CHECK_ONE_CFLAG([-Wunused-label])
diff --git a/src/consaver/cons.saver.c b/src/consaver/cons.saver.c
index e95f9db45..372fc559d 100644
--- a/src/consaver/cons.saver.c
+++ b/src/consaver/cons.saver.c
@@ -208,7 +208,6 @@ main (int argc, char **argv)
         break;
     default:
         die ();
-        break;
     }
 
     snprintf (console_name, sizeof (console_name), p, console_minor);
diff --git a/src/filemanager/hotlist.c b/src/filemanager/hotlist.c
index f77298245..3d7608223 100644
--- a/src/filemanager/hotlist.c
+++ b/src/filemanager/hotlist.c
@@ -856,8 +856,9 @@ hotlist_done (void)
 {
     dlg_destroy (hotlist_dlg);
     l_hotlist = NULL;
-    if (FALSE)
-        update_panels (UP_OPTIMIZE, UP_KEEPSEL);
+#if 0
+    update_panels (UP_OPTIMIZE, UP_KEEPSEL);
+#endif
     repaint_screen ();
 }
 
diff --git a/src/viewer/ascii.c b/src/viewer/ascii.c
index 5c2f86557..d04a54421 100644
--- a/src/viewer/ascii.c
+++ b/src/viewer/ascii.c
@@ -286,9 +286,9 @@ mcview_isprint (const mcview_t * view, int c)
     return g_unichar_isprint (c);
 #else
     (void) view;
-#endif /* HAVE_CHARSET */
     /* TODO this is very-very buggy by design: ticket 3257 comments 0-1 */
     return is_printable (c);
+#endif /* HAVE_CHARSET */
 }
 
 /* --------------------------------------------------------------------------------------------- */