diff --git a/include/extra/array.h b/include/extra/array.h
index af89ba0..fd662a9 100644
--- a/include/extra/array.h
+++ b/include/extra/array.h
@@ -17,6 +17,6 @@ extern ssize_t libcdsb_array_get(vtype_value* x, vtype_array* s, ssize_t index,
 extern ssize_t libcdsb_array_find(const vtype_array* x, const void* value, vtype value_type) LIBCDSB_nt__ LIBCDSB_nn1__;
 extern ssize_t libcdsb_array_push(      vtype_array* x, const void* value, vtype value_type) LIBCDSB_nt__ LIBCDSB_nn1__;
 
-extern int libcdsb_array_foreach(vtype_array* x, int (*callback)(void* value, ssize_t index, vtype type)) LIBCDSB_nt__ LIBCDSB_nn12__;
+extern int libcdsb_array_foreach(const vtype_array* x, int (*callback)(void* value, ssize_t index, vtype type)) LIBCDSB_nt__ LIBCDSB_nn12__;
 
 #endif /* LIBCDSB_EXTRA_ARRAY_H */
diff --git a/include/set.h b/include/set.h
index cb0202e..11e265b 100644
--- a/include/set.h
+++ b/include/set.h
@@ -9,10 +9,10 @@
 
 extern void vset_init(vtype_set* x, vtype type);
 
-#define vset_remove(x, value) _LIBCDSB_Generic (libcdsb_vset, touch, key)(x, value, 1)
-#define vset_push(x, value)   _LIBCDSB_Generic (libcdsb_vset, push,  key)(x, value)
+#define vset_remove(x, value) _LIBCDSB_Generic (libcdsb_vset, touch, value)(x, value, 1)
+#define vset_push(x, value)   _LIBCDSB_Generic (libcdsb_vset, push,  value)(x, value)
 
-#define in_vset(x, value)     _LIBCDSB_Generic (libcdsb_vset, touch, key)(x, value, 0)
+#define in_vset(x, value)     _LIBCDSB_Generic (libcdsb_vset, touch, value)(x, value, 0)
 
 extern _Bool libcdsb_vset_push_pointer(vtype_set* x,  const         void* value);
 extern _Bool libcdsb_vset_push_cstring(vtype_set* x,  const         char* value);
diff --git a/src/array/extra.c b/src/array/extra.c
index 99070e1..211d423 100644
--- a/src/array/extra.c
+++ b/src/array/extra.c
@@ -76,7 +76,7 @@ ssize_t libcdsb_array_get(val_t* x, arr_t* s, ssize_t i, _Bool cut) {
 
 /*#####################################################################################################################*/
 
-int libcdsb_array_foreach(vtype_array* x, int (*callback)(void* value, ssize_t index, vtype type)) {
+int libcdsb_array_foreach(const vtype_array* x, int (*callback)(void* value, ssize_t index, vtype type)) {
 
     void*  p;
     void*  e;