diff --git a/bashrc b/bashrc
index 2a9d025..043dd81 100644
--- a/bashrc
+++ b/bashrc
@@ -80,6 +80,7 @@ alias df='df -h'
 alias 49.3='sudo'
 alias pacman='pacman --color auto'
 alias x='startx; logout'
+alias x='sudo -s -E'
 
 # Solarized theme for tty, the dark version.
 # Based on:
diff --git a/config/i3/sshmenu b/config/i3/sshmenu
index e384578..9601712 100755
--- a/config/i3/sshmenu
+++ b/config/i3/sshmenu
@@ -1,6 +1,9 @@
 #!/bin/sh
 if [ "$1" == 'root' ]; then
     a=" (root)"
-    b="sudo "
+    b="sudo -E "
+fi
+machine=$(cat ~/.ssh/config | grep '^Host ' | cut -d ' ' -f 2 | grep -v '*' | sort | $HOME/.config/i3/dmenu_cmd -p "SSH$a to ")
+if [ ! -z $machine ]; then
+    xterm -e "ssh $machine -t '${b}bash --login'"
 fi
-xterm -e "ssh $(cat ~/.ssh/config | grep '^Host ' | cut -d ' ' -f 2 | grep -v '*' | sort | $HOME/.config/i3/dmenu_cmd -p "SSH$a to ") -t '${b}bash --login'"
diff --git a/scripts/debloc.sh b/scripts/debloc.sh
index eeca90e..99103b9 100755
--- a/scripts/debloc.sh
+++ b/scripts/debloc.sh
@@ -24,6 +24,9 @@ mkdir -p $DEBLOC_DB &> /dev/null
 mkdir -p $DEBLOC_ROOT &> /dev/null
 
 export PATH="$DEBLOC_ROOT/usr/bin:$DEBLOC_ROOT/usr/games/:$DEBLOC_ROOT/usr/lib/git-core:$PATH"
+export LIBRARY_PATH="$DEBLOC_LD:$LIBRARY_PATH"
+export C_INCLUDE_PATH="$DEBLOC_ROOT/include:$C_INCLUDE_PATH"
+export CPLUS_INCLUDE_PATH="$DEBLOC_ROOT/include:$CPLUS_INCLUDE_PATH"
 export LD_LIBRARY_PATH="$DEBLOC_LD:$LD_LIBRARY_PATH"
 export PYTHONPATH="$DEBLOC_ROOT/usr/lib/python3/dist-packages:$PYTHONPATH"
 export QT_QPA_PLATFORM_PLUGIN_PATH="$DEBLOC_ROOT/usr/lib/x86_64-linux-gnu/qt5/plugins/platforms"