diff --git a/src/bee-cache-inventory.c b/src/bee-cache-inventory.c
index 588f3c5..fe718cb 100644
--- a/src/bee-cache-inventory.c
+++ b/src/bee-cache-inventory.c
@@ -433,7 +433,7 @@ static void _strip_trailing(char *in, char c)
     len = strlen(in);
     p   = in+len-1;
 
-    while (p > in && *p == '/')
+    while (p > in && *p == c)
         *(p--) = 0;
 
 }
diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index 1cd1586..36eb605 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -334,7 +334,7 @@ function expand_prefix_variables() {
     expand_prefix_variables_defaults
     BEE_AUTO_EXCLUDE=""
     for var in PREFIX EPREFIX BINDIR SBINDIR LIBEXECDIR SYSCONFDIR \
-               SHAREDSTATEDIR LOCALSTATEDIR LIBDIR INCLUDEDIR \
+               LOCALSTATEDIR SHAREDSTATEDIR LIBDIR INCLUDEDIR \
                DATAROOTDIR DATADIR INFODIR LOCALEDIR MANDIR DOCDIR ; do
         eval eval ${var}=\${${var}}
         eval 'BEE_AUTO_EXCLUDE=( "${BEE_AUTO_EXCLUDE[@]}" \${${var}} )'
diff --git a/src/compat-filesfile2contentfile.sh.in b/src/compat-filesfile2contentfile.sh.in
old mode 100755
new mode 100644
diff --git a/src/compat-fixmetadir.sh.in b/src/compat-fixmetadir.sh.in
old mode 100755
new mode 100644