diff --git a/rio/simulator/state.mli b/rio/simulator/state.mli
index f47b6f8..511633b 100644
--- a/rio/simulator/state.mli
+++ b/rio/simulator/state.mli
@@ -4,7 +4,7 @@ exception UnboundKey of string
 
 val empty : t
 val rebind : string -> float -> t -> t
-val rebind_all : (string * float) list -> t -> t
+val rebind_all : (string * 'a) list -> t -> t
 val is_defined : string -> t -> bool
 val lookup : string -> t -> float
 val lookup_opt : string -> t -> float option
diff --git a/rio/simulator/topo.ml b/rio/simulator/topo.ml
index 233f41b..fa532eb 100644
--- a/rio/simulator/topo.ml
+++ b/rio/simulator/topo.ml
@@ -14,9 +14,10 @@ let rec addr_to_string = function
 
 let rec of_policy (p : Frontend.Policy.t) =
   match p with
-  | Class _ -> Star
-  | Fifo plst | RoundRobin plst | Strict plst -> Node (List.map of_policy plst)
-  | WeightedFair wplst -> Node (List.map (fun (p, _) -> of_policy p) wplst)
+  | Fifo _ | EarliestDeadline _ | ShortestJobNext _ | ShortestRemaining _ ->
+      Node [ Star ]
+  | RoundRobin plst | Strict plst -> Node (List.map of_policy plst)
+  | WeightedFair (wplst, _) -> Node (List.map of_policy wplst)
 
 let rec height = function
   | Star -> 1