diff --git a/src/axom/quest/interface/internal/mpicomm_wrapper.hpp b/src/axom/quest/interface/internal/mpicomm_wrapper.hpp
index 90a5310e67..25d40c7cee 100644
--- a/src/axom/quest/interface/internal/mpicomm_wrapper.hpp
+++ b/src/axom/quest/interface/internal/mpicomm_wrapper.hpp
@@ -21,8 +21,10 @@
 #ifdef AXOM_USE_MPI
   #include <mpi.h>
 #else
+  #ifndef MPI_VERSION
 using MPI_Comm = int;
 constexpr int MPI_COMM_SELF = -1;
+  #endif
 #endif
 
 #endif /* QUEST_MPICOMM_WRAPPER_HPP_ */
diff --git a/src/axom/quest/interface/signed_distance.cpp b/src/axom/quest/interface/signed_distance.cpp
index 7a455233fe..d7adb3826f 100644
--- a/src/axom/quest/interface/signed_distance.cpp
+++ b/src/axom/quest/interface/signed_distance.cpp
@@ -342,14 +342,14 @@ void signed_distance_set_execution_space(SignedDistExec exec_space)
     signed_distance_initialized(),
     "signed distance query already initialized; setting option has no effect!");
 
-#if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA)
+#if !defined(AXOM_USE_OPENMP) && !defined(AXOM_USE_RAJA)
   if(exec_space == SignedDistExec::OpenMP)
   {
     SLIC_ERROR("Signed distance query not compiled with OpenMP support");
   }
 #endif
 
-#if defined(AXOM_USE_GPU) && defined(AXOM_USE_RAJA)
+#if !defined(AXOM_USE_GPU) && !defined(AXOM_USE_RAJA)
   if(exec_space == SignedDistExec::GPU)
   {
     SLIC_ERROR("Signed distance query not compiled with GPU support");