diff --git a/bin/dm-ant b/bin/dm-ant
index c9e6e2fc83bc3a460f23e72be1718b3aff84746b..633233f61559d776deabf304cddd5895ee5acb77 100755
--- a/bin/dm-ant
+++ b/bin/dm-ant
@@ -13,8 +13,8 @@ if [ -z $DM_ROOT_DIR ]; then
 fi
 
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-export JAVA_HOME=$DM_SUPPORT/java/$DM_HOST_ARCH
-export ANT_HOME=$DM_SUPPORT/ant
+export JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
+export ANT_HOME=$DM_SUPPORT_DIR/ant
 export PATH=$ANT_HOME/bin:$PATH
 ant $@
 
diff --git a/setup.sh b/setup.sh
index 6c11e728774d474bfa7cf3d2e9950394f222940c..bd290424586f61d96b16aafbf1efb26cd88813bf 100644
--- a/setup.sh
+++ b/setup.sh
@@ -53,8 +53,10 @@ prependPathIfDirExists() {
 }
 
 # Setup path and other variables
-PATH=$DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH/bin:$PATH
-PATH=$DM_ROOT_DIR/bin:$PATH
+prependPathIfDirExists $DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_SUPPORT_DIR/java/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_SUPPORT_DIR/ant/bin
+prependPathIfDirExists $DM_ROOT_DIR/bin
 PATH=.:$PATH
 export PATH
 
@@ -65,9 +67,8 @@ else
 fi
 export LD_LIBRARY_PATH
 
-# Setup python path. First check for wx, then try to  find it locally, and 
-# then re-check for it.
-# Check if we have  local python
+# Setup python path. 
+# Check if we have local python
 if [ -z $DM_PYTHON_DIR ]; then
     pythonDir=$DM_SUPPORT_DIR/python/$DM_HOST_ARCH
 else
diff --git a/src/Makefile b/src/Makefile
index 6d9c7bda8578741337bb6f0d434b6f0d9c95e0c5..f1bebab4ca751bc86ea65d2ce452c63f88bacdd1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
 
-TOP = ../..
-SUBDIRS = DmWebPortal
+TOP = ..
+SUBDIRS = java
 
 include $(TOP)/tools/make/RULES_DM