diff --git a/node_modules/ace_tree/lib/ace_tree/edit.js b/node_modules/ace_tree/lib/ace_tree/edit.js
index 09bb8dfb..a76f115f 100644
--- a/node_modules/ace_tree/lib/ace_tree/edit.js
+++ b/node_modules/ace_tree/lib/ace_tree/edit.js
@@ -258,6 +258,7 @@ var EditableTree = function(tree) {
         
         var ace = this.ace;
         this.ace = null;
+        this.$lastAce = ace;
         ace.renderer.freeze();
         setTimeout(function() {
             // doing this after timeout to allow rename event focus something else
@@ -267,6 +268,7 @@ var EditableTree = function(tree) {
                 ace.wrapper.parentNode.removeChild(ace.wrapper);
             if (wasFocused)
                 this.tree.focus();
+            this.$lastAce = null;
         }.bind(this));
     };
     
@@ -386,6 +388,7 @@ var EditableTree = function(tree) {
             
         var val = this.ace.getValue();
         
+        this._destroyEditor();
         
         if (!cancel && this.origVal !== val) {
             this.tree._emit("rename", {
@@ -396,8 +399,6 @@ var EditableTree = function(tree) {
             });
             this.tree.provider._signal("change");
         }
-        
-        this._destroyEditor();
     };
 
 }).call(EditableTree.prototype);
diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js
index 0805a6cd..6885fefa 100644
--- a/node_modules/vfs-local/localfs.js
+++ b/node_modules/vfs-local/localfs.js
@@ -1562,7 +1562,7 @@ module.exports = function setup(fsOptions) {
                         // todo add resize event    
                         proc.emit("data", {rows: rows, cols: cols});
                         
-                        if (!tmuxWarned) {
+                        if (!tmuxWarned && !isWin) {
                             if (/v0\.([123456789]\..*|10\.(0|1|2[0-7]))/.test(process.version)) {
                                 proc.emit("data", {
                                     message: "Wrong Node.js version: " + process.version, 
@@ -2020,7 +2020,8 @@ module.exports = function setup(fsOptions) {
         };
         
         this.resize = function() {
-            return pty.resize.apply(pty, arguments);
+            if (!exited)
+                return pty.resize.apply(pty, arguments);
         };
         
         // this.acknowledgeWrite = function(callback) {
diff --git a/package.json b/package.json
index 13021900..bb9015b9 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#9956689819",
         "c9.ide.save": "#4cda35bfdb",
-        "c9.ide.scm": "#219b66019a",
+        "c9.ide.scm": "#637a68cd04",
         "c9.ide.terminal.monitor": "#affa33572f",
         "c9.ide.test": "#102942ae4e",
         "c9.ide.test.mocha": "#fc053b23d2",
diff --git a/plugins/c9.ide.layout.classic/less/btn-switcher.less b/plugins/c9.ide.layout.classic/less/btn-switcher.less
index 3af6342c..74e4a5cc 100644
--- a/plugins/c9.ide.layout.classic/less/btn-switcher.less
+++ b/plugins/c9.ide.layout.classic/less/btn-switcher.less
@@ -1,8 +1,10 @@
 .btn-switcher {
     .user-select(none);
-    
+    -webkit-display: flex;
+    display: flex;
+    -webkit-align-items: center;
+    align-items: center;
     cursor: default;
-    line-height: 19px;
     font-size: @preview-chooser-font-size;
     font-weight: @preview-chooser-font-weight;
     color: ;
@@ -46,6 +48,5 @@
 .btn-switcherIcon {
     background-repeat: no-repeat;
     padding-left: 25px;
-    padding-top: 5px;
-    background-position: 5px 6px;
+    background-position: 5px 50%
 }
\ No newline at end of file
diff --git a/plugins/c9.ide.terminal/aceterm/input.js b/plugins/c9.ide.terminal/aceterm/input.js
index 18289eb8..424afcbd 100644
--- a/plugins/c9.ide.terminal/aceterm/input.js
+++ b/plugins/c9.ide.terminal/aceterm/input.js
@@ -221,7 +221,7 @@ define(function(require, exports, module) {
         }]);
         
         ace.onPaste = function(text) {
-            this.send(text.replace(/\r\n/g, "\n"));
+            this.send(text.replace(/\r\n?|\n/g, this.session.term.convertEol ? "\n" : "\r"));
         };
         
         ace.setKeyboardHandler(this);
diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js
index 7aff77a6..34187998 100644
--- a/plugins/c9.ide.tree/tree.js
+++ b/plugins/c9.ide.tree/tree.js
@@ -520,7 +520,7 @@ define(function(require, exports, module) {
                 }
                 
                 if (dirname(newpath) != dirname(path)) {
-                    tree.edit.ace.blur(); // TODO this shouldn't be needed when apf focus works
+                    tree.edit.$lastAce && tree.edit.$lastAce.blur(); // TODO this shouldn't be needed when apf focus works
                     question(
                         "Confirm move to a new folder",
                         "move '" + e.oldValue + "' to \n" +