diff --git a/rpc.js b/rpc.js
index 053d8cf6e..cff3dfeb0 100644
--- a/rpc.js
+++ b/rpc.js
@@ -19,7 +19,7 @@ RPC.create = function (config, cb) {
     // load pin-store...
 
     console.log('loading rpc module...');
-    rpc = function (ctx, msg, respond) {
+    var rpc = function (ctx, msg, respond) {
         switch (msg[0]) {
             case 'ECHO':
                 respond(void 0, msg);
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index f0b63d83e..cde8840ac 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -994,15 +994,15 @@ define([
         var fo = proxy.fo;
 
         var list = fo.getFilesDataFiles().map(function (href) {
-            var parsed = Cryptpad.parsePadUrl(href);
+            var parsed = common.parsePadUrl(href);
             if (!parsed || !parsed.hash) { return; }
 
-            parsed = Cryptpad.parseHash(parsed.hash);
+            parsed = common.parseHash(parsed.hash);
 
             var channel = parsed.channel;
             if (!channel) { return; }
 
-            var hex = Cryptpad.base64ToHex(channel);
+            var hex = common.base64ToHex(channel);
             return hex;
         }).filter(function (x) { return x; }).sort();