diff --git a/_oasis b/_oasis
index 610d5ea5..95e1a1a1 100644
--- a/_oasis
+++ b/_oasis
@@ -117,8 +117,8 @@ Library "containers_thread"
   FindlibParent:    containers
   Build$:           flag(thread)
   Install$:         flag(thread)
-  BuildDepends:     containers,threads
-  XMETARequires:    containers,threads
+  BuildDepends:     containers, threads
+  XMETARequires:    containers, threads
 
 Library "containers_lwt"
   Path:             src/lwt
diff --git a/_tags b/_tags
index 8e068caf..9d30517c 100644
--- a/_tags
+++ b/_tags
@@ -160,5 +160,5 @@
 <tests/*.ml{,i}>: thread
 <src/threads/*.ml{,i}>: thread
 <src/core/CCVector.cmx>: inline(25)
-<src/{string,core}/**/*.ml>: warn_A, warn(-4), warn(-44)
+<src/**/*.ml> and not <src/misc/*.ml>: warn_A, warn(-4), warn(-44)
 true: no_alias_deps
diff --git a/doc/intro.txt b/doc/intro.txt
index 0b2dbe43..83a4e44f 100644
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -41,6 +41,10 @@ CCString
 CCVector
 }
 
+{4 Pervasives (aliases to Core Modules)}
+
+{!modules: CCPervasives}
+
 {4 Containers.data}
 
 {!modules:
@@ -48,6 +52,7 @@ CCBV
 CCCache
 CCFQueue
 CCFlatHashtbl
+CCMixtbl
 CCMultiMap
 CCMultiSet
 CCPersistentHashtbl
@@ -94,7 +99,6 @@ Hashset
 Heap
 Heap
 LazyGraph
-Mixtbl
 PHashtbl
 PrintBox
 RAL
@@ -107,7 +111,7 @@ Univ
 
 {4 Others}
 
-{!modules: Future}
+{!modules: CCFuture}
 
 
 {2 Index}
diff --git a/src/advanced/CCLinq.ml b/src/advanced/CCLinq.ml
index 82433e3d..fd2e79a1 100644
--- a/src/advanced/CCLinq.ml
+++ b/src/advanced/CCLinq.ml
@@ -38,7 +38,7 @@ let _id x = x
 
 exception ExitWithError of string
 let _exit_with_error s = raise (ExitWithError s)
-let _error_of_exn f = try `Ok (f ()) with ExitWithError s -> `Error
+let _error_of_exn f = try `Ok (f ()) with ExitWithError s -> `Error s
 
 type 'a collection =
   | Seq : 'a sequence -> 'a collection
@@ -519,9 +519,9 @@ and _optimize_unary : type a b. (a,b) unary -> a t -> b t
         _optimize_unary
           (FilterMap (fun x -> if p x then Some (f x) else None))
           cont
-    | PMap f, Binary (Append, q1, q2) ->
+    | PMap _, Binary (Append, q1, q2) ->
         _optimize_binary Append (Unary (u, q1)) (Unary (u, q2))
-    | Filter p, Binary (Append, q1, q2) ->
+    | Filter _, Binary (Append, q1, q2) ->
         _optimize_binary Append (Unary (u, q1)) (Unary (u, q2))
     | Fold (f,acc), Unary (PMap f', cont) ->
         _optimize_unary
@@ -739,7 +739,7 @@ let group_by ?cmp ?eq ?hash f q =
   Unary (GroupBy (_make_build ?cmp ?eq ?hash (),f), q)
 
 let group_by' ?cmp ?eq ?hash f q =
-  M.iter (group_by ?cmp f q)
+  M.iter (group_by ?cmp ?eq ?hash f q)
 
 let count ?cmp ?eq ?hash () q =
   Unary (Count (_make_build ?cmp ?eq ?hash ()), q)
diff --git a/src/sexp/CCSexp.ml b/src/sexp/CCSexp.ml
index c446b374..618dba68 100644
--- a/src/sexp/CCSexp.ml
+++ b/src/sexp/CCSexp.ml
@@ -141,7 +141,7 @@ let to_chan oc t =
 
 let to_file_seq filename seq =
   _with_out filename
-    (fun oc -> 
+    (fun oc ->
       seq (fun t -> to_chan oc t; output_char oc '\n')
     )
 
@@ -167,7 +167,7 @@ module Source = struct
       mutable stop : bool;
       buf : Buffer.t;     (* accessible chunk of input *)
     }
-      
+
     let make() = {
       i = 0;
       stop = false;
@@ -231,7 +231,7 @@ module Source = struct
       then (
         match g() with
         | None -> stop := true; NC_end
-        | Some buf -> s := buf; i := 0; next () 
+        | Some buf -> s := buf; i := 0; next ()
       ) else (
         let c = String.get !s !i in
         incr i;
diff --git a/src/sexp/CCSexp.mli b/src/sexp/CCSexp.mli
index 09de18e6..5a9520ed 100644
--- a/src/sexp/CCSexp.mli
+++ b/src/sexp/CCSexp.mli
@@ -283,7 +283,7 @@ module Traverse : sig
 
   val to_list_with : (t -> 'a option) -> 'a list conv
   (** Expect a list, applies [f] to all the elements of the list, and succeeds
-      only if [f] succeeded on every element 
+      only if [f] succeeded on every element
       @since 0.4.1 *)
 
   val to_pair : (t * t) conv