diff --git a/include/rfb.js b/include/rfb.js
index 5f3d7884..5658924e 100644
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -919,7 +919,7 @@ init_msg = function() {
 
         /* Connection name/title */
         name_length   = ws.rQshift32();
-        fb_name = Util.decodeUTF8(ws.rQshiftUStr(name_length));
+        fb_name = Util.decodeUTF8(ws.rQshiftUTFStr(name_length));
         conf.onDesktopName(that, fb_name);
         
         if (conf.true_color && fb_name === "Intel(r) AMT KVM")
diff --git a/include/websock.js b/include/websock.js
index 346915d2..2ed4d5b2 100644
--- a/include/websock.js
+++ b/include/websock.js
@@ -153,7 +153,7 @@ function rQshiftUTFStr(len) {
             var fou = rQ[++i];
             var z = ((code & 0x7) << 2) | ((sec & 0x30) >> 4);
             var y = ((sec & 0xf) << 4) | ((thi & 0x3c) >> 2);
-            var x = ((thi & 0x3) << 6) | (fou & 0x 3f);
+            var x = ((thi & 0x3) << 6) | (fou & 0x3f);
             code = (z << 16) | (y << 8) | x;
             arr.push(code);
         }
@@ -427,33 +427,33 @@ function constructor() {
     api.maxBufferedAmount = 200;
 
     // Direct access to send and receive queues
-    api.get_sQ       = get_sQ;
-    api.get_rQ       = get_rQ;
-    api.get_rQi      = get_rQi;
-    api.set_rQi      = set_rQi;
+    api.get_sQ        = get_sQ;
+    api.get_rQ        = get_rQ;
+    api.get_rQi       = get_rQi;
+    api.set_rQi       = set_rQi;
 
     // Routines to read from the receive queue
-    api.rQlen        = rQlen;
-    api.rQpeek8      = rQpeek8;
-    api.rQshift8     = rQshift8;
-    api.rQunshift8   = rQunshift8;
-    api.rQshift16    = rQshift16;
-    api.rQshift32    = rQshift32;
-    api.rQshiftStr   = rQshiftStr;
-    api.rQshiftUStr  = rQshiftUTFStr;
-    api.rQshiftBytes = rQshiftBytes;
-    api.rQslice      = rQslice;
-    api.rQwait       = rQwait;
+    api.rQlen         = rQlen;
+    api.rQpeek8       = rQpeek8;
+    api.rQshift8      = rQshift8;
+    api.rQunshift8    = rQunshift8;
+    api.rQshift16     = rQshift16;
+    api.rQshift32     = rQshift32;
+    api.rQshiftStr    = rQshiftStr;
+    api.rQshiftUTFStr = rQshiftUTFStr;
+    api.rQshiftBytes  = rQshiftBytes;
+    api.rQslice       = rQslice;
+    api.rQwait        = rQwait;
 
-    api.flush        = flush;
-    api.send         = send;
-    api.send_string  = send_string;
+    api.flush         = flush;
+    api.send          = send;
+    api.send_string   = send_string;
 
-    api.on           = on;
-    api.init         = init;
-    api.open         = open;
-    api.close        = close;
-    api.testMode     = testMode;
+    api.on            = on;
+    api.init          = init;
+    api.open          = open;
+    api.close         = close;
+    api.testMode      = testMode;
 
     return api;
 }