diff --git a/input.c b/input.c
index 21b345768..3dc701687 100644
--- a/input.c
+++ b/input.c
@@ -224,6 +224,7 @@ wchar_t input_get_code( wchar_t *name )
 /**
    Returns the function name for the given function code.
 */
+/*
 static const wchar_t *input_get_name( wchar_t c )
 {
 
@@ -237,10 +238,11 @@ static const wchar_t *input_get_name( wchar_t c )
 	}
 	return 0;		
 }
-
+*/
 /**
    Returns the function description for the given function code.
 */
+/*
 static const wchar_t *input_get_desc( wchar_t c )
 {
 
@@ -254,7 +256,7 @@ static const wchar_t *input_get_desc( wchar_t c )
 	}
 	return 0;		
 }
-
+*/
 void input_set_mode( wchar_t *name )
 {
 	current_mode_mappings = (array_list_t *)hash_get( &all_mappings, name );	
@@ -327,6 +329,7 @@ void add_mapping( const wchar_t *mode,
    Compare sort order for two keyboard mappings. This function is made
    to be suitable for use with the qsort method. 
 */
+/*
 static int mapping_compare( const void *a, const void *b )
 {
 	mapping *c = *(mapping **)a;
@@ -337,7 +340,7 @@ static int mapping_compare( const void *a, const void *b )
 	return wcscmp( c->seq_desc, d->seq_desc );
 	
 }
-
+*/
 
 
 /**
diff --git a/wildcard.c b/wildcard.c
index a6b1d7214..4a519e975 100644
--- a/wildcard.c
+++ b/wildcard.c
@@ -152,7 +152,7 @@ static int wildcard_complete_internal( const wchar_t *orig,
 		}
 		else
 		{
-			wchar_t *this_desc = desc;
+			const wchar_t *this_desc = desc;
 			
 			if( desc_func )
 			{
@@ -161,7 +161,7 @@ static int wildcard_complete_internal( const wchar_t *orig,
 				  it. If it returns something, use that as the
 				  description.
 				*/
-				wchar_t *func_desc = desc_func( orig );
+				const wchar_t *func_desc = desc_func( orig );
 				if( func_desc )
 					this_desc = func_desc;
 			}