diff --git a/codepot/docker/build-ubnt2004.sh b/codepot/docker/build-ubnt2004.sh
index 4ba7b42d..b47779ff 100755
--- a/codepot/docker/build-ubnt2004.sh
+++ b/codepot/docker/build-ubnt2004.sh
@@ -58,6 +58,6 @@ cat <<EOF > /var/www/html/index.html
 EOF
 
 apt-get remove --purge -y php-dev libsvn-dev make libfdisk1 && \
-apt-get auto-remove -y && rm -rf /var/lib/apt/lists/*
+apt-get autoremove --purge -y && rm -rf /var/lib/apt/lists/*
 
 rm -rf /root/.subversion
diff --git a/codepot/pecl-svn/svn.c b/codepot/pecl-svn/svn.c
index f0485e75..4dafefba 100755
--- a/codepot/pecl-svn/svn.c
+++ b/codepot/pecl-svn/svn.c
@@ -1023,8 +1023,8 @@ cleanup:
 #if defined(APR_MAJOR_VERSION) && ((APR_MAJOR_VERSION >= 2) || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 5))
 static int compare_keys(const void *a, const void *b) 
 {
-	Bucket *f = *((Bucket **) a);
-	Bucket *s = *((Bucket **) b);
+	Bucket *f = (Bucket*)a;
+	Bucket *s = (Bucket*)b;
 	/*return strcmp(f->arKey, s->arKey);*/
 	int diff = ZSTR_LEN(f->key) - ZSTR_LEN(s->key);
 	if (diff) return diff;
@@ -1242,9 +1242,8 @@ cleanup:
 #if defined(APR_MAJOR_VERSION) && ((APR_MAJOR_VERSION >= 2) || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 5))
 static int compare_keys_as_paths(const void *a, const void *b) 
 {
-	Bucket *f = *((Bucket **) a);
-	Bucket *s = *((Bucket **) b);
-	/*return svn_sort_compare_paths(&(f->arKey), &(s->arKey));*/
+	Bucket *f = (Bucket*)a;
+	Bucket *s = (Bucket*)b;
 	int diff =  ZSTR_LEN(f->key) - ZSTR_LEN(s->key);
 	if (diff) return diff;
 	return strncmp(ZSTR_VAL(f->key), ZSTR_VAL(s->key), ZSTR_LEN(f->key));