diff --git a/History.md b/History.md
index a7ce98b94..8e60fb074 100644
--- a/History.md
+++ b/History.md
@@ -19,7 +19,8 @@ Starting from this release we will also distribute official docker images on
 both the
 [GitHub release page](https://github.com/wekan/wekan/releases)
 and on the
-[DockerHub](https://hub.docker.com/r/mquandalle/wekan).
+[DockerHub](https://hub.docker.com/r/mquandalle/wekan). We also improved
+Sandstorm integration with the support of its build-in sharing model.
 
 New languages supported: Chinese, Finnish, Spanish, Korean, and Russian.
 
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index 9e807b900..e3ca80743 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -46,12 +46,12 @@ template(name="boardMenuPopup")
     li: a.js-open-archives Archived elements
     if currentUser.isBoardAdmin
       li: a.js-change-board-color Change color
-  //-
-    XXX Language should be handled by sandstorm, but for now display a
-    language selection link in the board menu. This link is normally present
-    in the header bar that is not displayed on sandstorm.
-  if isSandstorm
-    li: a.js-change-language {{_ 'language'}}
+    //-
+      XXX Language should be handled by sandstorm, but for now display a
+      language selection link in the board menu. This link is normally present
+      in the header bar that is not displayed on sandstorm.
+    if isSandstorm
+      li: a.js-change-language {{_ 'language'}}
   unless isSandstorm
     if currentUser.isBoardAdmin
       hr
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 19103f980..d23dd5f28 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -5,7 +5,7 @@ Template.boardMenuPopup.events({
     Popup.close();
   },
   'click .js-change-board-color': Popup.open('boardChangeColor'),
-  'click .js-change-language': Popup.open('setLanguage'),
+  'click .js-change-language': Popup.open('changeLanguage'),
   'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
     var boardId = Session.get('currentBoard');
     Boards.update(boardId, { $set: { archived: true }});
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index 9eeb843bb..71250aae5 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -37,8 +37,16 @@ template(name="header")
       else if($eq currentRouteName 'home')
         +headerTitle
 
-      a.wekan-logo(href="{{pathFor 'home'}}")
-        img(src="/wekan-logo-header.png" alt="Wekan")
+      //-
+        On sandstorm, the logo shouldn't be clickable, because we only have one
+        page/document on it, and we don't want to see the home page containing
+        the list of all boards.
+      if isSandstorm
+        .wekan-logo
+          img(src="/wekan-logo-header.png" alt="Wekan")
+      else
+        a.wekan-logo(href="{{pathFor 'home'}}")
+          img(src="/wekan-logo-header.png" alt="Wekan")
 
 template(name="headerTitle")
   h1 My Boards
diff --git a/meta/description.md b/meta/description.md
index 6e990de76..f56aa82ba 100644
--- a/meta/description.md
+++ b/meta/description.md
@@ -2,8 +2,8 @@ Wekan is an open-source and collaborative kanban board application.
 
 Whether you’re maintaining a personal todo list, planning your holidays with
 some friends, or working in a team on your next revolutionary idea, Kanban
-boards are an unbeatable tool keep your things organized. They give you a visual
-overview of the current state of your project, and make you productive by
+boards are an unbeatable tool to keep your things organized. They give you a
+visual overview of the current state of your project, and make you productive by
 allowing you to focus on the few items that matter the most.
 
 Wekan implements all the goodness of kanban board in an open-source software