diff --git a/default.nix b/default.nix
index 86f1eb4e7bb..65d37486fd0 100644
--- a/default.nix
+++ b/default.nix
@@ -36,7 +36,7 @@ let real-dvm =
       let dev = builtins.fetchGit {
         url = "ssh://git@github.com/dfinity-lab/dev";
         ref = "master";
-        rev = "22285295f0095d5596f762371a98e03313dc8a72";
+        rev = "b6f587c3303b9f2585548e5fcb98f907b0275219";
       }; in
       (import dev {}).dvm
     else null
diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix
index 6c42587eb82..d01483704f0 100644
--- a/nix/nixpkgs.nix
+++ b/nix/nixpkgs.nix
@@ -1,6 +1,6 @@
-with { rev = "e1ad1a0aa2ce6f9fd951d18181ba850ca8e74133"; };
+with { rev = "d50bc0afd23ae2c6bcc31556b005f4e9421d2532"; };
 
 import (builtins.fetchTarball {
-  sha256 = "0vk5sjmbq52xfrinrhvqry53asl6ppwbly1l7ymj8g0j4pkjf7p1";
+  sha256 = "1vdh3x0a65z2k4mzf2f7jpyggqhnqv2716xc51gg4a1lgnf3g8pa";
   url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
 })
diff --git a/src/encodeMap.ml b/src/encodeMap.ml
index 0f42dab6860..ed5a85b2444 100644
--- a/src/encodeMap.ml
+++ b/src/encodeMap.ml
@@ -545,7 +545,7 @@ let encode m =
 
   let mappings = Buffer.contents map in
   let n = max 0 ((String.length mappings) - 1) in
-  let json : Yojson.Basic.json = `Assoc [
+  let json : Yojson.Basic.t = `Assoc [
     ("version", `Int 3);
     ("sources", `List ( List.map (fun x -> `String x) !sources ) );
     ("sourcesContent", `List ( List.map (fun x -> if x = "" then `Null else `String x) !sourcesContent ) );
diff --git a/src/js_main.ml b/src/js_main.ml
index d76f2878645..862a9eb1bdc 100644
--- a/src/js_main.ml
+++ b/src/js_main.ml
@@ -1,5 +1,7 @@
 open Source
 
+module Js = Js_of_ocaml.Js
+
 let position_of_pos pos =
   object%js
     (* The LSP spec requires zero-based positions *)
diff --git a/test/run/words.as b/test/run/words.as
index 479df6a7f2a..7f77b256236 100644
--- a/test/run/words.as
+++ b/test/run/words.as
@@ -24,7 +24,7 @@ func checkpointJuliett() {};
     let d : Word64 = -15;
     let e : Word64 = 20000;
 
-// CHECK: get_local $c
+// CHECK: local.get $c
 // CHECK-NOT: call $box_i64
 // CHECK: call $printW64ln
     printW64ln(+c);
@@ -80,7 +80,7 @@ func checkpointJuliett() {};
 
 // CHECK: call $checkpointBravo
     checkpointBravo();
-// CHECK: get_local $c
+// CHECK: local.get $c
 // CHECK-NOT: call $box_i32
 // CHECK: call $printW32ln
     printW32ln(+c);
@@ -140,9 +140,9 @@ func checkpointJuliett() {};
 
 // CHECK: call $checkpointDelta
     checkpointDelta();
-// CHECK: get_local $a
+// CHECK: local.get $a
 // This is not a native Wasm i32 multiplication, we need to shift one of the args left by 16 bits!
-// CHECK-NEXT: get_local $b
+// CHECK-NEXT: local.get $b
 // CHECK-NEXT: i32.const 16
 // CHECK-NEXT: i32.shr_u
 // CHECK-NEXT: i32.mul
@@ -159,7 +159,7 @@ func checkpointJuliett() {};
 
 // CHECK: call $checkpointEcho
    checkpointEcho();
-// CHECK: get_local $b
+// CHECK: local.get $b
 // This is not a native Wasm i32 left shift, we need to shift the second arg left by 16 bits and clamp it to 4 bits!
 // CHECK-NEXT: i32.const 16
 // CHECK-NEXT: i32.shr_u
@@ -175,14 +175,14 @@ func checkpointJuliett() {};
 
 // CHECK: call $checkpointFoxtrot
    checkpointFoxtrot();
-// CHECK: get_local $b
+// CHECK: local.get $b
 // CHECK-NEXT: call $rotl<Word16>
 // CHECK-NEXT: call $printW16ln
     printW16ln(c <<> b);
 
 // CHECK: call $checkpointGolf
    checkpointGolf();
-// CHECK: get_local $b
+// CHECK: local.get $b
 // CHECK-NEXT: call $rotr<Word16>
 // CHECK-NEXT: call $printW16ln
     printW16ln(c <>> b);
@@ -218,7 +218,7 @@ func checkpointJuliett() {};
     printW8ln(c - a);
 // CHECK: call $checkpointHotel
     checkpointHotel();
-// CHECK: get_local $b
+// CHECK: local.get $b
 // This is not a native Wasm i32 multiplication, we need to shift one of the args left by 24 bits!
 // CHECK-NEXT: i32.const 24
 // CHECK-NEXT: i32.shr_u
@@ -236,7 +236,7 @@ func checkpointJuliett() {};
 
 // CHECK: call $checkpointIndia
     checkpointIndia();
-// CHECK: get_local $b
+// CHECK: local.get $b
 // This is not a native Wasm i32 left shift, we need to shift the second arg left by 24 bits and clamp it to 3 bits!
 // CHECK-NEXT: i32.const 24
 // CHECK-NEXT: i32.shr_u
@@ -252,11 +252,11 @@ func checkpointJuliett() {};
 
 // CHECK: call $checkpointJuliett
     checkpointJuliett();
-// CHECK: get_local $b
+// CHECK: local.get $b
 // CHECK-NEXT: call $rotl<Word8>
 // CHECK-NEXT: call $printW8ln
     printW8ln(c <<> b);
-// CHECK: get_local $b
+// CHECK: local.get $b
 // CHECK-NEXT: call $rotr<Word8>
 // CHECK-NEXT: call $printW8ln
     printW8ln(c <>> b);