diff --git a/src/algos/simplex/tests/test_simplex.real.ml b/src/algos/simplex/tests/test_simplex.real.ml
index 341d2d6f..ee1be3bf 100644
--- a/src/algos/simplex/tests/test_simplex.real.ml
+++ b/src/algos/simplex/tests/test_simplex.real.ml
@@ -124,8 +124,8 @@ module Step = struct
                  | [] -> []
                  | vs ->
                    let gen =
-                     let+ x = oneofl vs
-                     and+ kind = oneofl [ `Leq; `Lt; `Geq; `Gt ]
+                     let+ x = oneof_list vs
+                     and+ kind = oneof_list [ `Leq; `Lt; `Geq; `Gt ]
                      and+ n = rand_q.QC.gen in
                      ( vars,
                        match kind with
@@ -145,11 +145,11 @@ module Step = struct
                  (if List.length vars > 2 then (
                    let v = List.length vars in
                    let gen =
-                     let* vars' = G.shuffle_l vars in
+                     let* vars' = shuffle_list vars in
                      let* n = 1 -- min 12 (List.length vars') in
                      let vars' = CCList.take n vars' in
                      assert (List.length vars' = n);
-                     let* coeffs = list_repeat n rand_q.gen in
+                     let* coeffs = list_size (return n) rand_q.gen in
                      let le = List.combine coeffs vars' in
                      return (v :: vars, S_define (v, le))
                    in
diff --git a/src/main/show_trace.ml b/src/main/show_trace.ml
index 38e56702..de64bf2a 100644
--- a/src/main/show_trace.ml
+++ b/src/main/show_trace.ml
@@ -10,7 +10,7 @@ type state = {
   p_reader: Proof.Trace_reader.t;
 }
 
-let show_sat (self : state) ~tag v : unit =
+let show_sat (_self : state) ~tag v : unit =
   match tag with
   | "AssCSat" ->
     (match
diff --git a/src/sat/solver.ml b/src/sat/solver.ml
index d9a6f775..d412cc33 100644
--- a/src/sat/solver.ml
+++ b/src/sat/solver.ml
@@ -13,7 +13,7 @@ module Atom = Store.Atom
 module Var = Store.Var
 module Clause = Store.Clause
 
-module H = Heap.Make [@specialise] (struct
+module H = Heap.Make (struct
   type store = Store.t
   type t = var