diff --git a/CEP/Calibration/BBSControl/src/CalSessionTransactors.cc b/CEP/Calibration/BBSControl/src/CalSessionTransactors.cc
index 7214d320b7b52d064533e1848cbc2bacf33716db..f72f5811ee7514e6619ce5b65be32b12d47e88bb 100644
--- a/CEP/Calibration/BBSControl/src/CalSessionTransactors.cc
+++ b/CEP/Calibration/BBSControl/src/CalSessionTransactors.cc
@@ -220,7 +220,7 @@ void PQRegisterAsKernel::operator()(argument_type &transaction)
         << pack_vector(transaction, itsGrid[0]->uppers()) << "',E'"
         << pack_vector(transaction, itsGrid[1]->lowers()) << "',E'"
         << pack_vector(transaction, itsGrid[1]->uppers()) << "')";
-//    LOG_DEBUG_STR("Query: " << query.str());
+    LOG_DEBUG_STR("Query: " << query.str());
 
     itsQueryResult = transaction.exec(query.str());
 }
diff --git a/CEP/Calibration/BBSControl/src/KernelProcessControl.cc b/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
index a6eadb4833a563ffba557ef607cb3a43eedae9c5..51415fb803814c797603d828f0c5fa67c9084b76 100644
--- a/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
+++ b/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
@@ -213,7 +213,9 @@ namespace LOFAR
         // Try to register as kernel.
         if(!itsCalSession->registerAsKernel(filesys, path,
           itsMeasurement->grid())) {
-          LOG_ERROR("Registration denied.");
+          LOG_ERROR_STR("Could not register as kernel. There may be stale"
+            " state in the database for key: " << key);
+          //LOG_ERROR("Registration denied.");
           return false;
         }
 
diff --git a/CEP/Calibration/BBSControl/src/SolverProcessControl.cc b/CEP/Calibration/BBSControl/src/SolverProcessControl.cc
index 972dc77def16db2bd9cedc9ddbddf7a188d275f8..04b5b7bd14cfa3a2ef41fa3e28bc62c180d340e4 100644
--- a/CEP/Calibration/BBSControl/src/SolverProcessControl.cc
+++ b/CEP/Calibration/BBSControl/src/SolverProcessControl.cc
@@ -154,7 +154,9 @@ namespace LOFAR
 
         // Try to register as solver.
         if(!itsCalSession->registerAsSolver(port)) {
-          LOG_ERROR("Registration denied.");
+          LOG_ERROR_STR("Could not register as solver. There may be stale"
+            " state in the database for key: " << key);
+          //LOG_ERROR("Registration denied.");
           return false;
         }
 
diff --git a/CEP/Calibration/BBSControl/src/calibrate b/CEP/Calibration/BBSControl/src/calibrate
index 6a99cad9ef711fecec0ed91e39190361cb28595d..cf12a757894c5ccea5bb342c65d4d57c61886a4f 100755
--- a/CEP/Calibration/BBSControl/src/calibrate
+++ b/CEP/Calibration/BBSControl/src/calibrate
@@ -46,7 +46,7 @@ usage()
     echo "  -v, --verbose     be verbose"
     echo "  -f, --force       expands to --clean, --replace-sky-db,"
     echo "                    --replace-instrument-db"
-    echo "  -n, --nocolumns   do not add imaging columns to MS (default=do it)"
+    echo "  -n, --no-columns  do not add imaging columns to MS (default=do it)"
     echo "  --dry             do not start any processes"
     echo "  --clean           clean control database for the specified key"
     echo "  --key keyname     unique key to identify the session"
@@ -158,7 +158,7 @@ do
   elif test "${1}" = "--dry"; then
     shift
     dry=1
-  elif test "${1}" = "-n" -o "${1}" = "--nocolumns"; then
+  elif test "${1}" = "-n" -o "${1}" = "--no-columns"; then
     shift
     imcolumns=0
   elif test "${1}" = "--clean"; then
@@ -549,11 +549,11 @@ fi
 
 event "execute remote KernelControl processes"
 if test ${verbose} -eq 1 -o ${dry} -eq 1; then
-    echo "startdistproc -useenv -mode 0 -nomasterhost -dsn \"${observation}\" -cdn \"${cluster_desc}\" -logfile \"${key}_calibrate-part_$$.log\" \"${pgmpath}/calibrate-part\" \"${LOFARROOT}\" \"${wd}\" \"${key}\" \"${db_host}\" \"${db_port}\" \"${db_name}\" \"${db_user}\" \"${instrument_basename}\" \"${sky_basename}\" dry ${imcolumns}"
+    echo "startdistproc -useenv -mode 0 -nomasterhost -dsn \"${observation}\" -cdn \"${cluster_desc}\" -logfile \"${key}_calibrate-part_$$.log\" \"${pgmpath}/calibrate-part\" \"${LOFARROOT}\" \"${wd}\" \"${key}\" \"${db_host}\" \"${db_port}\" \"${db_name}\" \"${db_user}\" \"${instrument_basename}\" \"${sky_basename}\" ${imcolumns} dry"
 fi
 
 if test ${dry} -eq 0; then
-    startdistproc -useenv -mode 0 -nomasterhost -dsn "${observation}" -cdn "${cluster_desc}" -logfile "${key}_calibrate-part_$$.log" "${pgmpath}/calibrate-part" "${LOFARROOT}" "${wd}" "${key}" "${db_host}" "${db_port}" "${db_name}" "${db_user}" "${instrument_basename}" "${sky_basename}" nodry "${imcolumns}"
+    startdistproc -useenv -mode 0 -nomasterhost -dsn "${observation}" -cdn "${cluster_desc}" -logfile "${key}_calibrate-part_$$.log" "${pgmpath}/calibrate-part" "${LOFARROOT}" "${wd}" "${key}" "${db_host}" "${db_port}" "${db_name}" "${db_user}" "${instrument_basename}" "${sky_basename}" "${imcolumns}" nodry
 
     if test $? -ne 0; then
         kill_all "${pidlist}"
diff --git a/CEP/Calibration/BBSControl/src/calibrate-part b/CEP/Calibration/BBSControl/src/calibrate-part
index df6c9d46bb1997abc3f7d2b9d748ec77379a8722..50f1aaf2ae67120990f8340bc5d1dd0bb3cb7318 100755
--- a/CEP/Calibration/BBSControl/src/calibrate-part
+++ b/CEP/Calibration/BBSControl/src/calibrate-part
@@ -72,6 +72,7 @@ sourcedb=${13}
 dry=${14}
 imcolumns=${15}
 
+
 echo "arguments:"
 echo "    part: ${part}"
 echo "    filesys: ${filesys}"