diff --git a/src/lib/salad/rtree.c b/src/lib/salad/rtree.c
index ae657491aa18d0cc00e20d75e8d4bc68d290c2fe..49f4206b854c8a22f5b797348e553542b29ffb39 100644
--- a/src/lib/salad/rtree.c
+++ b/src/lib/salad/rtree.c
@@ -76,7 +76,7 @@ struct rtree_reinsert_list {
 };
 
 static int
-neighbor_cmp(struct rtree_neighbor *a, struct rtree_neighbor *b)
+neighbor_cmp(const struct rtree_neighbor *a, const struct rtree_neighbor *b)
 {
 	return a->distance < b->distance ? -1 :
 	       a->distance > b->distance ? 1 :
diff --git a/src/lib/small b/src/lib/small
index 22d1bad1873edcb9b1383a273e70c4cf881d5349..cdf7d4a8e24ae465298d0ddacaf1aaed1085281e 160000
--- a/src/lib/small
+++ b/src/lib/small
@@ -1 +1 @@
-Subproject commit 22d1bad1873edcb9b1383a273e70c4cf881d5349
+Subproject commit cdf7d4a8e24ae465298d0ddacaf1aaed1085281e