diff --git a/Makefile b/Makefile
index 0389925e2..4273b87d2 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ DATADIR=/usr/share/plinth
 PYDIR=$(DATADIR)/python/plinth
 
 ## Catch-all tagets
-default: predepend config dirs template css docs dbs
+default: config dirs template css docs dbs
 all: default
 
 predepend:
diff --git a/modules/installed/first_boot.py b/modules/installed/first_boot.py
index 9cf747454..ff3a27e63 100644
--- a/modules/installed/first_boot.py
+++ b/modules/installed/first_boot.py
@@ -5,7 +5,7 @@ from plugin_mount import PagePlugin, PluginMount, FormPlugin
 from modules.auth import require
 from forms import Form
 import util as u
-from vendor.withsqlite.withsqlite import sqlite_db
+from withsqlite.withsqlite import sqlite_db
 import cfg
 
 class FirstBoot(PagePlugin):
diff --git a/plinth.py b/plinth.py
index 1c74d73c2..b3ada9d71 100755
--- a/plinth.py
+++ b/plinth.py
@@ -17,8 +17,8 @@ import util as u
 from logger import Logger
 #from modules.auth import AuthController, require, member_of, name_is
 
-from vendor.withsqlite.withsqlite import sqlite_db
-from vendor.exmachina.exmachina import ExMachinaClient
+from withsqlite.withsqlite import sqlite_db
+from exmachina.exmachina import ExMachinaClient
 import socket
 
 __version__ = "0.2.14"
diff --git a/start.sh b/start.sh
index 8b97c0bcd..8e141fcf8 100755
--- a/start.sh
+++ b/start.sh
@@ -5,6 +5,6 @@
 export PYTHONPATH
 
 sudo killall exmachina.py
-sudo vendor/exmachina/exmachina.py -v &
+sudo /usr/share/pyshared/exmachina/exmachina.py -v &
 python plinth.py
 sudo killall exmachina.py