diff --git a/opam-requirements.txt b/opam-requirements.txt
index a37f7402..7319de75 100644
--- a/opam-requirements.txt
+++ b/opam-requirements.txt
@@ -2,7 +2,7 @@ csv.1.2.2
 ounit.1.1.2
 xmlm.1.1.1
 mcl.12-068oasis3
-batteries.2.0.0
+batteries.2.1.0
 ocaml-gsl.0.6.3
 sqlite3-ocaml.1.6.3
 camlzip.1.05
diff --git a/pplacer_src/minimization.ml b/pplacer_src/minimization.ml
index 05033fa4..f6b702d9 100644
--- a/pplacer_src/minimization.ml
+++ b/pplacer_src/minimization.ml
@@ -64,7 +64,7 @@ let robust_start_finder ?(max_iters=100) f raw_start left right _ =
         (* map those integers to their input values, and filter to make sure in
          * left right*)
         let jump_enum = Enum.filter
-          (fun x -> left < x & x < right)
+          (fun x -> left < x && x < right)
           (Enum.map (fun i -> raw_start +. (incr_ratio i)) jump_indices)
         in
         Enum.iter check_start jump_enum
diff --git a/pplacer_src/pca.ml b/pplacer_src/pca.ml
index f8108e22..da72de92 100644
--- a/pplacer_src/pca.ml
+++ b/pplacer_src/pca.ml
@@ -1,6 +1,6 @@
 open Ppatteries
 
-let tol = 1e-15
+let tol = 1e-14
 let max_iter = 100000
 
 
diff --git a/tests/guppy/test_unifrac.ml b/tests/guppy/test_unifrac.ml
index 03c9f73e..21dfd343 100644
--- a/tests/guppy/test_unifrac.ml
+++ b/tests/guppy/test_unifrac.ml
@@ -13,6 +13,8 @@ let suite = [
     let names, (prl, prel) =
       pres_of_dir Mass_map.Spread Placement.ml_ratio "simple"
         |> Hashtbl.enum
+        (* Sort by name: Hashtbl does not guarantee order *)
+        |> (List.of_enum %> (List.sort compare) %> List.enum)
         |> Enum.uncombine
         |> (Tuple2.map Array.of_enum (List.of_enum %> List.split))
     in