diff --git a/.gitignore b/.gitignore
index d630b10d5cee10a05e25dc619580016814e49cf3..4276b4cd330681b45f0702180b382b91c1dd5079 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ server.url
 /tools/wa_venv
 /tools/wa_user_directory/dependencies
 src/buildroot
+*.egg-info
diff --git a/install_base_ubuntu.sh b/install_base_ubuntu.sh
index 06ee507a066f8530bb737eafe6e4ecebd2fc727e..ffee69ee9c540f286beb379fa7b29cf2bd3daa8b 100755
--- a/install_base_ubuntu.sh
+++ b/install_base_ubuntu.sh
@@ -22,7 +22,8 @@ install_sdk() {
 	wget -qO- $ANDROID_SDK_URL | tar xz -C $SCRIPT_DIR/tools/
 	expect -c "
 	    set timeout -1;
-	    spawn $SCRIPT_DIR/tools/android-sdk-linux/tools/android update sdk --no-ui
+	    spawn $SCRIPT_DIR/tools/android-sdk-linux/tools/android \
+		    update sdk --no-ui -t tools,platform-tools
 	    expect {
 		\"Do you accept the license\" { exp_send \"y\r\" ; exp_continue }
 		eof
diff --git a/setup.py b/setup.py
index 550cd53730bb6bf39ebf1b71a1ef0d7e5928d486..17be172830a6efad6fa990592001d7da8bbc52fb 100755
--- a/setup.py
+++ b/setup.py
@@ -104,7 +104,7 @@ setup(
     extras_require={
         "notebook": [
             "ipython",
-            "jupyter"
+            "jupyterlab"
         ],
 
         "doc": [
diff --git a/shell/lisa_shell b/shell/lisa_shell
index 904aa863d074167505eb38042851e4dfadc8407e..44a51984e1776a4c87eec6e80556c4426fdf34c8 100755
--- a/shell/lisa_shell
+++ b/shell/lisa_shell
@@ -265,11 +265,10 @@ function _lisa-jupyter-start {
         echo
         echo "could not determine IP address of $NETIF"
         echo
-        echo "Usage: $0 <NETIF>"
-        echo " NETIF - The network interface to start the server on"
-        echo
+	_lisa-jupyter-usage
         return 1
     fi
+
     # Setup paths
     PYDIR="$LISA_HOME/ipynb"
     LOGFILE="$PYDIR/server.log"
@@ -288,6 +287,16 @@ function _lisa-jupyter-start {
         return 1
     fi
 
+    # Check required port is available (e.g. Vagrant could using the same port)
+    if netstat -nlt | grep $PORT &>/dev/null; then
+        echo
+        echo "ERROR: required port [$PORT] already in use"
+        echo "       try again with a different PORT option"
+        echo
+	_lisa-jupyter-usage
+	return 1
+    fi
+
     # Start the server bound to the specified interface
     echo
     echo 'Notebook server configuration:'
@@ -299,9 +308,9 @@ function _lisa-jupyter-start {
     cd $PYDIR
     echo
     echo -n 'Notebook server task: '
-    nohup jupyter notebook --ip="$IPADDR" --port="$PORT" \
-                        --NotebookApp.token="$TOKEN" \
-                        >"$LOGFILE" 2>&1 &
+    nohup jupyter lab --ip="$IPADDR" --port="$PORT" \
+                      --NotebookApp.token="$TOKEN" \
+                      >"$LOGFILE" 2>&1 &
     echo $! >"$PIDFILE"
     echo $URL >"$URLFILE"
     cd - >/dev/null