diff --git a/libslv2/slv2/pluginlist.h b/libslv2/slv2/pluginlist.h
index 535c2141..ac2422b6 100644
--- a/libslv2/slv2/pluginlist.h
+++ b/libslv2/slv2/pluginlist.h
@@ -116,7 +116,7 @@ slv2_list_load_bundle(SLV2List    list,
 
 /** Get the number of plugins in the list.
  */
-unsigned long
+size_t
 slv2_list_get_length(const SLV2List list);
 
 
diff --git a/libslv2/src/pluginlist.c b/libslv2/src/pluginlist.c
index e379c7ae..45d71f93 100644
--- a/libslv2/src/pluginlist.c
+++ b/libslv2/src/pluginlist.c
@@ -55,7 +55,7 @@ slv2_list_load_all(SLV2List list)
 {
 	assert(list != NULL);
 	
-	const char* slv2_path = getenv("LV2_PATH");
+	char* slv2_path = getenv("LV2_PATH");
 
 	if (slv2_path) {
 	    slv2_list_load_path(list, slv2_path);