diff --git a/src/file.c b/src/file.c
index ad1c45a1..0181f52e 100644
--- a/src/file.c
+++ b/src/file.c
@@ -493,7 +493,7 @@ file_get_country_files(void)
     GPtrArray *dir_contents = NULL;
     GPtrArray *country_files_full_path = g_ptr_array_new();
     gchar buf[SMALL];
-    gchar *country_structure;
+    const gchar *country_structure;
 
     while(elem != NULL)
     {
diff --git a/src/treeview.c b/src/treeview.c
index 5f29e68b..9a927ee1 100644
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -2660,7 +2660,7 @@ treeview_create_country_list(const GPtrArray *country_list)
         if (g_str_has_prefix(current_country,G_DIR_SEPARATOR_S))
         {
             // Strip leading directory delimiter
-            sprintf(current_country, "%.*s", strlen(current_country) - 1, &current_country[1]);
+            sprintf(current_country, "%.*s", (gint)strlen(current_country) - 1, &current_country[1]);
         }
         dir_split_up = g_strsplit_set (current_country, G_DIR_SEPARATOR_S, -1);
         // We only go up to the before last column.  We don't want to show the