diff --git a/www/common/sframe-channel.js b/www/common/sframe-channel.js
index b12d112ba..dcf5e1abc 100644
--- a/www/common/sframe-channel.js
+++ b/www/common/sframe-channel.js
@@ -126,7 +126,7 @@ define([
                     data = undefined;
                 });
             } else if (typeof(data.q) === 'undefined' && queries[data.txid]) {
-                queries[data.txid](msg, msg);
+                queries[data.txid](data, msg);
             } else if (data.txid === txid) {
                 // stray message from init
                 return;
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index d32bfab3a..ccefbb217 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -940,7 +940,7 @@ define([
         // Create the subelements
         var tb = {};
         tb['userlist'] = createUserList;
-        tb['share'] = createShare; //TODO
+        tb['share'] = createShare;
         tb['fileshare'] = createFileShare;//TODO
         tb['title'] = createTitle;
         tb['pageTitle'] = createPageTitle;//TODO