diff --git a/src/ChangeLog b/src/ChangeLog
index d9fbb41b4..6870484aa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-20  Pavel Roskin  <proski@gnu.org>
+
+	* file.c (panel_get_file): Use g_assert_not_reached().
+	* key.c (xgetch_second): Make static.
+
 2001-07-19  Pavel Roskin  <proski@gnu.org>
 
 	* user.c (check_format_view): Match "unform" instead of
diff --git a/src/file.c b/src/file.c
index ff8801893..351e955fa 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1556,9 +1556,8 @@ panel_get_file (WPanel *panel, struct stat *stat_buf)
 	*stat_buf = panel->dir.list [panel->selected].buf;
 	return panel->dir.list [panel->selected].fname;
     }
-    fprintf (stderr, _(" Internal error: get_file \n"));
-    mi_getch ();
-    return "";
+    g_assert_not_reached ();
+    return NULL;
 }
 
 int
diff --git a/src/key.c b/src/key.c
index e9358ae47..817315c12 100644
--- a/src/key.c
+++ b/src/key.c
@@ -88,7 +88,7 @@ static key_def *keys = 0;
 static int input_fd;
 static fd_set select_set;
 static int disabled_channels = 0; /* Disable channels checking */
-int xgetch_second (void);
+static int xgetch_second (void);
 
 /* File descriptor monitoring add/remove routines */
 typedef struct SelectList {
@@ -800,7 +800,7 @@ int mi_getch ()
     return key;
 }
 
-int xgetch_second (void)
+static int xgetch_second (void)
 {
     fd_set Read_FD_Set;
     int c;