diff --git a/.gitattributes b/.gitattributes
index 7302a9e255092d96ef7eb3ef3b60e2ee99a505f5..a9278b03d451551e649ffe328f06a0fa6cfddaf2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2099,7 +2099,6 @@ CMake/variants/variants.cbt008 -text
 CMake/variants/variants.cbt009 -text
 CMake/variants/variants.dop252 -text
 CMake/variants/variants.dop256 -text
-CMake/variants/variants.dop282 -text
 CMake/variants/variants.fs0 -text
 CMake/variants/variants.gpu01 -text
 CMake/variants/variants.gpu1 -text
diff --git a/CMake/variants/variants.dop282 b/CMake/variants/variants.dop282
deleted file mode 100644
index 51cdb899407f3d2b7955190b611584b36eaf162c..0000000000000000000000000000000000000000
--- a/CMake/variants/variants.dop282
+++ /dev/null
@@ -1,8 +0,0 @@
-set(GNU_COMPILE_DEFINITIONS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
-set(ENV{CUDA_LIB_PATH} /usr/lib/nvidia-current)
-
-# NVidia does not support GCC 4.7 and up
-set(GNU_C         /usr/bin/gcc-4.6 )
-set(GNU_CXX       /usr/bin/g++-4.6 )
-set(GNU_Fortran   /usr/bin/gfortran-4.6)
-set(GNU_ASM       /usr/bin/gcc-4.6 )
diff --git a/LCS/Common/test/tSaxpy.cc b/LCS/Common/test/tSaxpy.cc
index 02f656d038bee00e9fd984720a53f9040414f149..b52ebc7f0b0a4c78dd91ef5119baf827e1b412b5 100644
--- a/LCS/Common/test/tSaxpy.cc
+++ b/LCS/Common/test/tSaxpy.cc
@@ -82,13 +82,13 @@ int main (int argc, const char* argv[])
   cout<< "float,float " << n << endl;
   saxpy<float,float> (n, 0);
   cout<< "__complex__ float,float " << n << endl;
-  saxpy<__complex__ float,float> (n, 0.+0.i);
+  saxpy<__complex__ float,float> (n, 0.);
   cout<< "std::complex<float>,float " << n << endl;
   saxpy<std::complex<float>,float> (n, std::complex<float>());
   cout<< "double,double " << n << endl;
   saxpy<double,double> (n, 0);
   cout<< "__complex__ double,double " << n << endl;
-  saxpy<__complex__ double,double> (n, 0.+0.i);
+  saxpy<__complex__ double,double> (n, 0.);
   cout<< "std::complex<double>,double " << n << endl;
   saxpy<std::complex<double>,double> (n, std::complex<double>());
   cout<< "std::complex<double>,std::complex<double> " << n << endl;
diff --git a/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc b/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc
index 118d43b51d8b94effdad41fea6c8f0c23f9980a9..1a00226db687052e58f8a2dfb2cf456c7bd0de26 100644
--- a/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc
+++ b/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc
@@ -26,6 +26,7 @@
 //# Includes
 #include <Common/LofarLogger.h>
 #include <Common/lofar_string.h>
+#include <Common/SystemUtil.h>
 
 using namespace LOFAR;
 
diff --git a/RTCP/CNProc/src/InversePPF.h b/RTCP/CNProc/src/InversePPF.h
index f1a11f1ad59c318b814771271104f746047e9a20..60be84458a0a32bff5e8f12fde165237dbc3649a 100644
--- a/RTCP/CNProc/src/InversePPF.h
+++ b/RTCP/CNProc/src/InversePPF.h
@@ -68,6 +68,7 @@
 #include <Interface/Align.h>
 #include <Interface/AlignedStdAllocator.h>
 #include <vector>
+#include <boost/noncopyable.hpp>
 #include <FilterBank.h>
 #include <FIR.h>
 
diff --git a/RTCP/Cobalt/InputProc/src/CMakeLists.txt b/RTCP/Cobalt/InputProc/src/CMakeLists.txt
index 7fbae7f03fd05621fae5f6f010657bc7351df8c2..99b7a5dd88d16f85baf9fb0fc7319a89dd8893ed 100644
--- a/RTCP/Cobalt/InputProc/src/CMakeLists.txt
+++ b/RTCP/Cobalt/InputProc/src/CMakeLists.txt
@@ -22,6 +22,10 @@ set(_inputproc_sources
   Station/RSPPacketFactory.cc
 )
 
+message(STATUS "**** MPI_FOUND = ${MPI_FOUND}")
+message(STATUS "**** USE_MPI = ${USE_MPI}")
+message(STATUS "**** HAVE_MPI = ${HAVE_MPI}")
+
 if(MPI_FOUND)
   list(APPEND _inputproc_sources
     Transpose/MPISendStation.cc
diff --git a/RTCP/Cobalt/InputProc/src/OMPThread.h b/RTCP/Cobalt/InputProc/src/OMPThread.h
index 5877d1da78c4a43f03d342aa0be8726ab0ef4c0b..067628eea92aba6e39a3cb9afb6f3703ecbdb676 100644
--- a/RTCP/Cobalt/InputProc/src/OMPThread.h
+++ b/RTCP/Cobalt/InputProc/src/OMPThread.h
@@ -71,9 +71,8 @@ namespace LOFAR
     void kill()
     {
       while (!stopped) {
-        // Interrupt blocking system calls (most notably, read()),
-        // possibly multiple in a row.
-        // Note that the thread will stick around until the end
+        // interrupt blocking system calls (most notably, read())
+        // note that the thread will stick around until the end
         // of pragma parallel, so the thread id is always valid
         // once it has been set.
         pthread_t oldid = id;
@@ -113,16 +112,8 @@ namespace LOFAR
 
     static void init()
     {
-      // We avoid cancellation exception for OpenMP threads.
-      // Allow signalling them ourselves to cancel blocking syscalls.
-      struct sigaction sa;
-      sa.sa_handler = sighandler;
-      ::sigemptyset(&sa.sa_mask);
-      sa.sa_flags = SA_RESTART;
-      int err = ::sigaction(SIGHUP, &sa, NULL);
-      if (err != 0) {
-        LOG_WARN("Failed to register a handler for SIGHUP: OpenMP threads may not terminate!");
-      }
+      signal(SIGHUP, sighandler);
+      siginterrupt(SIGHUP, 1);
     }
 
   private:
diff --git a/RTCP/Cobalt/InputProc/src/mpirun.sh.in b/RTCP/Cobalt/InputProc/src/mpirun.sh.in
index 4940b611f697bb9f6f7d789040d19596ce75b1ec..1a7d4b6daa0cf7321ccec0d397eab29510390482 100755
--- a/RTCP/Cobalt/InputProc/src/mpirun.sh.in
+++ b/RTCP/Cobalt/InputProc/src/mpirun.sh.in
@@ -111,7 +111,8 @@ set_mvapich2_options()
   done
 }
 
-if [ "@HAVE_MPI@" = "TRUE" ]
+#if [ "@HAVE_MPI@" = "TRUE" ]
+if [ "@MPI_FOUND@" = "TRUE" ]
 then
   MPIEXEC=@MPIEXEC@
   MPIEXEC_PREFLAGS=@MPIEXEC_PREFLAGS@