diff --git a/CMake/FindBacktrace.cmake b/CMake/FindBacktrace.cmake
index 1993144d334a12f9cfc3166a37c8cc6267692749..ef0ba11e7ff6235d39d5cdf2c11923a1dd496f7f 100644
--- a/CMake/FindBacktrace.cmake
+++ b/CMake/FindBacktrace.cmake
@@ -14,12 +14,8 @@
 #  HAVE_BFD_H          - true if header file bfd.h exists
 #                        (contains declaration of bfd_* functions)
 #  BFD_LIBRARY         - full path to libbfd, if found
-#  IBERTY_LIBRARY      - full path to libiberty, if found
-#  HAVE_DEMANGLE_H     - true if header file demangle.h exists
-#                        (contains declaration of cplus_demangle())
-#  HAVE_DECL_BASENAME  - true if a declaration for basename() exists
-#  HAVE_CPLUS_DEMANGLE - true if function demangle() exists
-#  Z_LIBRARY           - full path to libz, if found
+#  IBERTY_LIBRARY      - full path to libiberty, if searched and found
+#  Z_LIBRARY           - full path to libz, if searched and found
 
 # Copyright (C) 2009-2010
 # ASTRON (Netherlands Institute for Radio Astronomy)
@@ -43,7 +39,6 @@
 
 include(CheckIncludeFile)
 include(CheckFunctionExists)
-include(CheckCXXSourceCompiles)
 include(FindPackageHandleStandardArgs)
 
 if(NOT BACKTRACE_FOUND)
@@ -69,11 +64,6 @@ if(NOT BACKTRACE_FOUND)
               list(APPEND BACKTRACE_LIBRARIES ${Z_LIBRARY})
             endif(Z_LIBRARY)
           endif(BFD_LIBRARY MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
-          # Check for C++ demangler
-          check_cxx_source_compiles("
-            #include <cxxabi.h>
-            int main() { abi::__cxa_demangle(\"\", 0, 0, 0); }"
-            HAVE___CXA_DEMANGLE)
         endif(BFD_LIBRARY)
       endif(HAVE_BFD_H)
     endif(HAVE_BACKTRACE)
diff --git a/CMake/variants/variants.dop131 b/CMake/variants/variants.dop131
index 8eb81ff190ed86da93bdfa8a31b3799338276a76..c62db6ec07951e328fd392c6bc0b6b9c8232d35d 100644
--- a/CMake/variants/variants.dop131
+++ b/CMake/variants/variants.dop131
@@ -1,2 +1,3 @@
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 #set(CASACORE_ROOT_DIR /opt/lofar/external/casacore)
+set(ENV{JAVA_HOME} /usr/lib64/jvm/java-1.6.0-openjdk-1.6.0)
diff --git a/LCS/Common/src/AddressTranslator.cc b/LCS/Common/src/AddressTranslator.cc
index 1f89c87af685a7886a05745f93acd6bbe09f12eb..41c197a61ad6de8be17c067affb70f972b8b4821 100644
--- a/LCS/Common/src/AddressTranslator.cc
+++ b/LCS/Common/src/AddressTranslator.cc
@@ -30,7 +30,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#ifdef HAVE___CXA_DEMANGLE
+#ifdef __GNUG__
 # include <cxxabi.h>
 #endif
 
@@ -66,7 +66,7 @@ namespace LOFAR
     
       if (found) {
         if (functionname && *functionname) {
-# ifdef HAVE___CXA_DEMANGLE
+# ifdef __GNUG__
           char* realname = abi::__cxa_demangle(functionname, 0, 0, 0);
           if (realname) {
             trace[i].function = realname;
diff --git a/lofar_config.h.cmake b/lofar_config.h.cmake
index 5e6a22d3ceb4d4d75d8594c771cb52cb00e09dc4..14d6aeb37175bea04b97bdc3552272d625fa229d 100644
--- a/lofar_config.h.cmake
+++ b/lofar_config.h.cmake
@@ -161,8 +161,5 @@
 /* Define to 1 if you have the `backtrace' function. */
 #cmakedefine HAVE_BACKTRACE 1
 
-/* Define to 1 if you have the `abi::__cxa_demangle' function. */
-#cmakedefine HAVE___CXA_DEMANGLE 1
-
 /* Define to 1 if you have a declaration for the `getprotobyname_r' function. */
 #cmakedefine HAVE_GETPROTOBYNAME_R 1