diff --git a/CMake/ctest_script.cmake b/CMake/ctest_script.cmake
index 36d013792..829ddd417 100644
--- a/CMake/ctest_script.cmake
+++ b/CMake/ctest_script.cmake
@@ -81,7 +81,9 @@ ENDIF()
 
 # Check that we specified the build type to run
 SET( USE_MATLAB 1 )
-SET( CTEST_BUILD_NAME "$ENV{QMCPACK_TEST_SUBMIT_NAME}" )
+IF ( NOT CTEST_BUILD_NAME )
+    SET( CTEST_BUILD_NAME "$ENV{QMCPACK_TEST_SUBMIT_NAME}" )
+ENDIF()
 IF ( NOT CTEST_BUILD_NAME )
     SET( CTEST_BUILD_NAME "QMCPACK_TEST_SUBMIT_NAME-unset" )
 ENDIF()
diff --git a/src/QMCWaveFunctions/AtomicOrbital.h b/src/QMCWaveFunctions/AtomicOrbital.h
index 6d314a624..63e36311b 100644
--- a/src/QMCWaveFunctions/AtomicOrbital.h
+++ b/src/QMCWaveFunctions/AtomicOrbital.h
@@ -8,6 +8,9 @@
 #include <Configuration.h>
 #include <Utilities/NewTimer.h>
 
+#define conj_ qmcplusplus::conj
+
+
 namespace qmcplusplus
 {
 
@@ -588,11 +591,11 @@ AtomicOrbital<StorageType>::CalcYlm (PosType rhat,
     for (int m=0; m<=l; m++)
     {
       Ylm[l*(l+1)+m]  =  XlmVec[l+m]*e2imphi;
-      Ylm[l*(l+1)-m]  =  XlmVec[l-m]*conj(e2imphi);
+      Ylm[l*(l+1)-m]  =  XlmVec[l-m]*conj_(e2imphi);
       dYlm_dphi[l*(l+1)+m ]  =  (double)m * eye *XlmVec[l+m]*e2imphi;
-      dYlm_dphi[l*(l+1)-m ]  = -(double)m * eye *XlmVec[l-m]*conj(e2imphi);
+      dYlm_dphi[l*(l+1)-m ]  = -(double)m * eye *XlmVec[l-m]*conj_(e2imphi);
       dYlm_dtheta[l*(l+1)+m] = dXlmVec[l+m]*e2imphi;
-      dYlm_dtheta[l*(l+1)-m] = dXlmVec[l-m]*conj(e2imphi);
+      dYlm_dtheta[l*(l+1)-m] = dXlmVec[l-m]*conj_(e2imphi);
       e2imphi *= e2iphi;
     }
     dl += 1.0;