diff --git a/_oasis b/_oasis
index 4cfb6a9..ed0be89 100644
--- a/_oasis
+++ b/_oasis
@@ -47,6 +47,7 @@ Document sequence
 Test all
   Type:         custom
   Command:      make run-tests
+  TestTools:    run_tests
   Run$:         flag(tests)
 
 Executable run_tests
diff --git a/sequence.ml b/sequence.ml
index 410b508..cc14f74 100644
--- a/sequence.ml
+++ b/sequence.ml
@@ -576,14 +576,20 @@ module Set = struct
     include Set.S
     val of_seq : elt sequence -> t
     val to_seq : t -> elt sequence
+    val to_list : t -> elt list
+    val of_list : elt list -> t
   end
 
   (** Create an enriched Set module from the given one *)
   module Adapt(X : Set.S) = struct
-    let to_seq set = from_iter (fun k -> X.iter k set)
+    let to_seq set k = X.iter k set
 
     let of_seq seq = fold (fun set x -> X.add x set) X.empty seq
 
+    let of_list l = of_seq (of_list l)
+
+    let to_list set = to_list (to_seq set)
+
     include X
   end
 
@@ -603,6 +609,8 @@ module Map = struct
     val of_seq : (key * 'a) sequence -> 'a t
     val keys : 'a t -> key sequence
     val values : 'a t -> 'a sequence
+    val to_list : 'a t -> (key * 'a) list
+    val of_list : (key * 'a) list -> 'a t
   end
 
   (** Adapt a pre-existing Map module to make it sequence-aware *)
@@ -615,6 +623,10 @@ module Map = struct
 
     let values m = from_iter (fun k -> M.iter (fun _ y -> k y) m)
 
+    let of_list l = of_seq (of_list l)
+
+    let to_list x = to_list (to_seq x)
+
     include M
   end
 
diff --git a/sequence.mli b/sequence.mli
index f130335..9f4f260 100644
--- a/sequence.mli
+++ b/sequence.mli
@@ -378,7 +378,8 @@ exception OneShotSequence
 val of_in_channel : in_channel -> char t
   (** Iterates on characters of the input (can block when one
       iterates over the sequence). If you need to iterate
-      several times on this sequence, use {!persistent}. *)
+      several times on this sequence, use {!persistent}.
+      @raise OneShotSequence when used more than once. *)
 
 val to_buffer : char t -> Buffer.t -> unit
   (** Copy content of the sequence into the buffer *)
@@ -419,6 +420,8 @@ module Set : sig
     include Set.S
     val of_seq : elt sequence -> t
     val to_seq : t -> elt sequence
+    val to_list : t -> elt list
+    val of_list : elt list -> t
   end
 
   (** Create an enriched Set module from the given one *)
@@ -437,6 +440,8 @@ module Map : sig
     val of_seq : (key * 'a) sequence -> 'a t
     val keys : 'a t -> key sequence
     val values : 'a t -> 'a sequence
+    val to_list : 'a t -> (key * 'a) list
+    val of_list : (key * 'a) list -> 'a t
   end
 
   (** Adapt a pre-existing Map module to make it sequence-aware *)