diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 128db6e5f..d9349f4b9 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -24,6 +24,7 @@ alias t='tail -f'
 alias -g H='| head'
 alias -g T='| tail'
 alias -g G='| grep'
+alias -g Gi='| grep -i'
 alias -g L="| less"
 alias -g M="| most"
 alias -g LL="2>&1 | less"
diff --git a/plugins/mkraev/mkraev.plugin.zsh b/plugins/mkraev/mkraev.plugin.zsh
index cd0e61498..88b05cd09 100644
--- a/plugins/mkraev/mkraev.plugin.zsh
+++ b/plugins/mkraev/mkraev.plugin.zsh
@@ -59,9 +59,12 @@ fi
 if [[ -x `which subl3` ]]; then
     alias s=subl3
 fi
+if [ "$SSH_TTY$DISPLAY" = "${DISPLAY#*:[1-9][0-9]}" ]; then
+  export EDITOR=gedit
+else
+  export EDITOR=vim
+fi
 
-
-export EDITOR=vim
 export VISUAL=$EDITOR
 
 if [ -d "$HOME/bin" ] ; then
@@ -74,9 +77,7 @@ fi
 
 #npm
 
-if [ -d "$HOME/.npm/bin" ] ; then
-  export PATH=${HOME}/.npm/bin:${PATH}
-fi
+export PATH=node_modules/.bin:${PATH}
 
 #go
 if [ -d "${HOME}/Projects/go" ] ; then