diff --git a/cdash/common.cmake b/cdash/common.cmake
index 13860297f789b22feecab4bf1415998808f43bf8..260c8041eba0e49aadbb8007445efc3361389ce8 100644
--- a/cdash/common.cmake
+++ b/cdash/common.cmake
@@ -16,13 +16,16 @@ set(CTEST_CONFIGURATION_TYPE ${CTEST_BUILD_CONFIGURATION})
 
 #---Set the source and build directory--------------------------------------
 set(CTEST_BUILD_PREFIX "$ENV{WORKDIR}")
-set(CTEST_SOURCE_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-source")
-set(CTEST_BINARY_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-build")
+#set(CTEST_SOURCE_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-source")
+#set(CTEST_BINARY_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-build")
+set(CTEST_SOURCE_DIRECTORY "${CTEST_BUILD_PREFIX}/source")
+set(CTEST_BINARY_DIRECTORY "${CTEST_BUILD_PREFIX}/build")
 
 #---Set the install directory----------------------------------------------- 
 # if $INSTALLDIR is given, use that one, otherwise derive from binary dir
 if("$ENV{INSTALLDIR}" STREQUAL "")
-  set(CTEST_INSTALL_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-install")
+#  set(CTEST_INSTALL_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-install")
+  set(CTEST_INSTALL_DIRECTORY "${CTEST_BUILD_PREFIX}/install")
 else()
   set(CTEST_INSTALL_DIRECTORY "$ENV{INSTALLDIR}")
 endif()
diff --git a/cdash/copy_to_afs.py b/cdash/copy_to_afs.py
index 8e6b8747837bcda095f0d48dbc66eda12fb69c6d..f70c26a676e7f4f0fa219073e8b47d73cfcc7b99 100755
--- a/cdash/copy_to_afs.py
+++ b/cdash/copy_to_afs.py
@@ -125,7 +125,7 @@ if __name__ == "__main__":
   compilerdir = compiler.split("bin")[0]
 
   # define source and target  
-  sourcedir = "%s/%s-install" %(workdir,platform)
+  sourcedir = "%s/install" %(workdir)
   targetdir = os.path.join(options.targetbase,slotname,today())
 
   # find out which directories to copy
diff --git a/cdash/isDone.sh b/cdash/isDone.sh
index 31a844bd1a9af4cc9700a74987a08f5f4060786a..b6395477f214f4d3fde0eb9d06c0b4b3714e21d5 100755
--- a/cdash/isDone.sh
+++ b/cdash/isDone.sh
@@ -15,11 +15,15 @@ platform=`$this/getPlatform.py`
 today=$(date +%a)
 nightdir=/afs/cern.ch/sw/lcg/app/nightlies
 donefile=$nightdir/$SLOTNAME/$today/isDone-$platform
-
+unstabledonefile=$nightdir/$SLOTNAME/$today/isDone-unstable-$platform
 if [ $isdone == 1 ]; then
   touch $donefile
   echo "Created file $donefile"
+elif [ $isdone == 2 ]; then
+  touch $unstabledonefile
+  echo "Created file unstable-$donefile"
 else
   rm -f $donefile
-  echo "Removed file $donefile"
+  rm -f $unstabledonefile
+  echo "Removed file $donefile and $unstabledonefile"
 fi
diff --git a/cdash/jk-runbuild.sh b/cdash/jk-runbuild.sh
index c9960fddf539ffed713be5c51d9bc5f195de11da..cedd6d6eb4ff06a9c17eeec9e773b0d5ea2c4dff 100755
--- a/cdash/jk-runbuild.sh
+++ b/cdash/jk-runbuild.sh
@@ -21,5 +21,14 @@ rm -rf /tmp/the.lock
 env | sort | sed 's/:/:?     /g' | tr '?' '\n'
 
 # do the build-----------------------------------------------------
-ctest -VV -S $THIS/lcgcmake-build.cmake
+ctest -VV -S $THIS/lcgcmake-build.cmake 
+
+if [ $? -eq 0 ]
+then
+  echo "Successfully created file"
+  exit 0
+else
+  echo "Could not create file" 
+  exit 1
+fi