diff --git a/src/jsonrpc2.ml b/src/jsonrpc2.ml
index ab16deda..b297aba0 100644
--- a/src/jsonrpc2.ml
+++ b/src/jsonrpc2.ml
@@ -167,7 +167,7 @@ module Make(IO : IO)
         IO.catch f
           (fun e ->
              let message = spf "%s\n%s" (Printexc.to_string e) (Printexc.get_backtrace()) in
-             Log.err (fun k->k "error: %s" msg);
+             Log.err (fun k->k "error: %s" message);
              let r = Jsonrpc.Response.error id
                (Jsonrpc.Response.Error.make
                  ~code:Jsonrpc.Response.Error.Code.InternalError
@@ -220,7 +220,7 @@ module Make(IO : IO)
             end)
           (fun e ->
             let message = spf "%s\n%s" (Printexc.to_string e) (Printexc.get_backtrace()) in
-            Log.err (fun k->k "error: %s" msg);
+            Log.err (fun k->k "error: %s" message);
             let r =
               Jsonrpc.Response.error id
               (Jsonrpc.Response.Error.make
diff --git a/src/server.ml b/src/server.ml
index edbe1442..021c0702 100644
--- a/src/server.ml
+++ b/src/server.ml
@@ -373,7 +373,7 @@ module Make(IO : IO) = struct
             | None ->
               (* WTF vscode. Well let's try and deal with it. *)
               Log.err (fun k->k "unknown document: '%s'" doc.uri);
-              let version = CCOpt.get_or ~default:0 doc.version in
+              let version = match doc.version with Some x->x | None -> 0 in
 
               let languageId = "" in (* FIXME*)
               Lsp.Text_document.make