diff --git a/ncrystal_core/include/NCrystal/NCAtomData.hh b/ncrystal_core/include/NCrystal/NCAtomData.hh
index d57b349b..48b0b196 100644
--- a/ncrystal_core/include/NCrystal/NCAtomData.hh
+++ b/ncrystal_core/include/NCrystal/NCAtomData.hh
@@ -126,7 +126,7 @@ namespace NCRYSTAL_NAMESPACE {
     AtomData() = delete;
     ~AtomData();
     bool operator <(const AtomData&) const;//Sorts roughly by (Z,A,description,uniqueid)
-     bool operator ==(const AtomData& o) const
+    bool operator ==(const AtomData& o) const
     {
       return !( *this < o ) && !( o < *this );
     }
diff --git a/ncrystal_core/include/NCrystal/NCMem.hh b/ncrystal_core/include/NCrystal/NCMem.hh
index 975cad99..67dec6f3 100644
--- a/ncrystal_core/include/NCrystal/NCMem.hh
+++ b/ncrystal_core/include/NCrystal/NCMem.hh
@@ -349,7 +349,7 @@ namespace NCRYSTAL_NAMESPACE {
   }
 }
 
-#if __cplusplus < 201402L
+#if nc_cplusplus < 201402L
 //Make sure we can use std::make_unique from C++14 even in C++11 code
 namespace std {
   template<typename T, typename ...Args>