diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index eba1dc97..542e6be3 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -10843,7 +10843,7 @@ function getBuffer(file_url, callback, flag, mode, port, cache = null) {
         }
       })
       .on("error", function (e) {
-        console.error("Got error: " + e.message);
+        console.error("getBuffer " + file_url + " error: " + e.message);
       });
   });
 }
diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js
index df3f3b14..649f2c4a 100644
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@@ -417,7 +417,7 @@ function gtChatMessage(jsmesg) {
     var cid = jsmesg.cid;
     jsmesg.when = Date.now();
     try {
-      jsmesg.msg = new Buffer(jsmesg.msg, "base64").toString("utf8");
+      jsmesg.msg = new Buffer.from(jsmesg.msg, "base64").toString("utf8");
       jsmesg.msg = htmlEntities(jsmesg.msg);
     } catch (e) {
       jsmesg.msg = "Corrupt message recieved";
@@ -446,7 +446,7 @@ function gtSendMessage(message, who) {
   msg.type = "mesg";
   msg.uuid = g_appSettings.chatUUID;
   msg.cid = who;
-  msg.msg = new Buffer(message).toString("base64");
+  msg.msg = new Buffer.from(message).toString("base64");
   sendGtJson(JSON.stringify(msg));
   msg.msg = htmlEntities(message);
   msg.id = 0;