diff --git a/benchmarks/Benchmark_memory_bandwidth.cc b/benchmarks/Benchmark_memory_bandwidth.cc
index 5abdc6a3..5b436001 100644
--- a/benchmarks/Benchmark_memory_bandwidth.cc
+++ b/benchmarks/Benchmark_memory_bandwidth.cc
@@ -20,7 +20,7 @@ int main (int argc, char ** argv)
   std::cout << "Grid is setup to use "<<threads<<" threads"<<std::endl;
   
   std::cout << "===================================================================================================="<<std::endl;
-  std::cout << "= Benchmarking fused AXPY bandwidth"<<std::endl;
+  std::cout << "= Benchmarking fused AXPY bandwidth ; sizeof(Real) "<<sizeof(Real)<<std::endl;
   std::cout << "===================================================================================================="<<std::endl;
   std::cout << "  L  "<<"\t\t"<<"bytes"<<"\t\t\t"<<"GB/s"<<"\t\t"<<"Gflop/s"<<std::endl;
   std::cout << "----------------------------------------------------------"<<std::endl;
diff --git a/lib/algorithms/approx/Remez.h b/lib/algorithms/approx/Remez.h
index 336382d2..e6a973df 100644
--- a/lib/algorithms/approx/Remez.h
+++ b/lib/algorithms/approx/Remez.h
@@ -15,7 +15,7 @@
 #ifndef INCLUDED_ALG_REMEZ_H
 #define INCLUDED_ALG_REMEZ_H
 
-#include <algorithms/approx/bigfloat.h>
+#include <algorithms/approx/bigfloat_double.h>
 
 #define JMAX 10000 //Maximum number of iterations of Newton's approximation
 #define SUM_MAX 10 // Maximum number of terms in exponential
diff --git a/scripts/configure-commands b/scripts/configure-commands
index 538f3661..4cb4b44f 100755
--- a/scripts/configure-commands
+++ b/scripts/configure-commands
@@ -16,10 +16,16 @@ echo -e $RED ==============================
 echo -e $YELLOW
 
 case $WD in
-g++-sse4)
+g++-avx)
+  CXX=g++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -std=c++11" LIBS="-lgmp -lmpfr" --enable-comms=none
+  ;;
+g++-avx-openmp)
+  CXX=g++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -fopenmp -O3 -std=c++11" LIBS="-fopenmp -lgmp -lmpfr" --enable-comms=none
+  ;;
+g++5-sse4)
   CXX=g++-5 ../../configure --enable-simd=SSE4 CXXFLAGS="-msse4 -O3 -std=c++11" LIBS="-lgmp -lmpfr" --enable-comms=none
   ;;
-g++-avx)
+g++5-avx)
   CXX=g++-5 ../../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -std=c++11" LIBS="-lgmp -lmpfr" --enable-comms=none
   ;;
 icpc-avx)
@@ -52,6 +58,12 @@ CXX=clang++ ../../configure --enable-simd=AVX2 CXXFLAGS="-mavx2 -mfma -O3 -std=c
 clang-avx-openmp)
 CXX=clang-omp++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -fopenmp -O3 -std=c++11" LDFLAGS="-fopenmp"  LIBS="-lgmp -lmpfr" --enable-comms=none
   ;;
+clang-xc30)
+CXX=$HOME/Clang/install/bin/clang++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -O3 -std=c++11 -I/opt/gcc/4.9.2/snos/include/g++/x86_64-suse-linux/ -I/opt/gcc/4.9.2/snos/include/g++/ " LDFLAGS=""  LIBS="-lgmp -lmpfr" --enable-comms=none
+  ;;
+clang-xc30-openmp)
+CXX=$HOME/Clang/install/bin/clang++ ../../configure --enable-simd=AVX CXXFLAGS="-mavx -fopenmp -O3 -std=c++11 -I/opt/gcc/4.9.2/snos/include/g++/x86_64-suse-linux/ -I/opt/gcc/4.9.2/snos/include/g++/ " LDFLAGS="-fopenmp"  LIBS="-lgmp -lmpfr" --enable-comms=none
+  ;;
 clang-avx2-openmp)
 CXX=clang-omp++ ../../configure --enable-simd=AVX2 CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" LDFLAGS="-fopenmp"  LIBS="-lgmp -lmpfr" --enable-comms=none
   ;;
diff --git a/scripts/configure-cray b/scripts/configure-cray
new file mode 100755
index 00000000..db581493
--- /dev/null
+++ b/scripts/configure-cray
@@ -0,0 +1,10 @@
+#!/bin/bash
+DIRS="g++-avx-openmp g++-avx clang-xc30 clang-xc30-openmp"
+
+for D in $DIRS
+do
+  mkdir -p builds/$D
+  cd builds/$D
+  ../../scripts/configure-commands $D
+  cd ../..
+done
diff --git a/scripts/cray-modules b/scripts/cray-modules
new file mode 100644
index 00000000..95de2b0b
--- /dev/null
+++ b/scripts/cray-modules
@@ -0,0 +1,2 @@
+module swap PrgEnv-cray PrgEnv-intel
+module swap intel/14.0.4.211 intel/15.0.2.164
diff --git a/tests/Test_dwf_hdcr.cc b/tests/Test_dwf_hdcr.cc
index 8d1a5fce..bafdb639 100644
--- a/tests/Test_dwf_hdcr.cc
+++ b/tests/Test_dwf_hdcr.cc
@@ -1,6 +1,6 @@
 #include <Grid.h>
 #include <algorithms/iterative/PrecGeneralisedConjugateResidual.h>
-#include <algorithms/iterative/PrecConjugateResidual.h>
+//#include <algorithms/iterative/PrecConjugateResidual.h>
 
 using namespace std;
 using namespace Grid;