diff --git a/etc/init.d/dm-mongo-express b/etc/init.d/dm-mongo-express
index 8482eec4528f163e055a42942bda29aa361a007e..87dcc9279309fc779a76fe84b0912da81cef33ca 100755
--- a/etc/init.d/dm-mongo-express
+++ b/etc/init.d/dm-mongo-express
@@ -44,7 +44,7 @@ mkdir -p ${DM_INSTALL_DIR}/var/log
 
 DM_MONGODB_HOST=${DM_MONGODB_HOST:=127.0.0.1}
 DM_MONGODB_PORT=${DM_MONGODB_PORT:=27017}
-DM_NODE_DIR=${DM_SUPPORT_DIR}/node/${DM_HOST_ARCH}
+DM_NODE_DIR=${DM_OPT_DIR}/node
 DM_FOREVER_DIR=${DM_NODE_DIR}/bin/node_modules/forever
 DM_MONGO_EXPRESS_DIR=${DM_NODE_DIR}/bin/node_modules/mongo-express
 
diff --git a/etc/init.d/dm-mongodb b/etc/init.d/dm-mongodb
index 70aea02a7ef71ea7c9849fd4c86602a0226f7ebd..78f00a75fc31b07efd644d033e515853246d4a06 100755
--- a/etc/init.d/dm-mongodb
+++ b/etc/init.d/dm-mongodb
@@ -44,7 +44,7 @@ mkdir -p ${DM_INSTALL_DIR}/var/log
 
 DM_MONGODB_HOST=${DM_MONGODB_HOST:=127.0.0.1}
 DM_MONGODB_PORT=${DM_MONGODB_PORT:=27017}
-DM_MONGODB_DIR=${DM_SUPPORT_DIR}/mongodb/${DM_HOST_ARCH}
+DM_MONGODB_DIR=${DM_OPT_DIR}/mongodb/${DM_HOST_ARCH}
 DM_MONGODB_DATA_DIR=${DM_MONGODB_DIR}/data
 mkdir -p ${DM_MONGODB_DATA_DIR}
 
diff --git a/setup.sh b/setup.sh
index 9600567ac383cc58fbced29cc77fadda21e392d2..786fab9fc389b585d3cb9a2efea0b31e4c77f2a2 100644
--- a/setup.sh
+++ b/setup.sh
@@ -54,7 +54,7 @@ prependPathIfDirExists() {
 }
 
 # Setup path and other variables
-prependPathIfDirExists $DM_OPT_DIR/node/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_OPT_DIR/node/bin
 prependPathIfDirExists $DM_OPT_DIR/mongodb/$DM_HOST_ARCH/bin
 prependPathIfDirExists $DM_OPT_DIR/postgresql/$DM_HOST_ARCH/bin
 prependPathIfDirExists $DM_OPT_DIR/java/$DM_HOST_ARCH/bin
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index ccd277af3e5dadbbeacb83a19043b3180b23c2d2..817b136229a896c15b127b2af580b029833dc0e3 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -1 +1 @@
-__version__ = "1.0 (2017.01.23)"
+__version__ = "1.0 (2017.01.24)"