diff --git a/packages/amesos2/src/Amesos2_ConcreteMatrixAdapter_def.hpp b/packages/amesos2/src/Amesos2_ConcreteMatrixAdapter_def.hpp
index e6e8bcb778c2..885fe801c419 100644
--- a/packages/amesos2/src/Amesos2_ConcreteMatrixAdapter_def.hpp
+++ b/packages/amesos2/src/Amesos2_ConcreteMatrixAdapter_def.hpp
@@ -15,9 +15,5 @@
 
 #include "Amesos2_TpetraCrsMatrix_MatrixAdapter_def.hpp"
 #include "Amesos2_KokkosCrsMatrix_MatrixAdapter_def.hpp"
-#ifdef HAVE_AMESOS2_EPETRA
-// NOTE: this causes re-defitions
-//#  include "Amesos2_EpetraCrsMatrix_MatrixAdapter_def.hpp"
-#endif
 
 #endif
diff --git a/packages/amesos2/src/Amesos2_EpetraCrsMatrix_MatrixAdapter.cpp b/packages/amesos2/src/Amesos2_EpetraCrsMatrix_MatrixAdapter.cpp
index 3cbbe09b2ca8..8a64a37cc2cb 100644
--- a/packages/amesos2/src/Amesos2_EpetraCrsMatrix_MatrixAdapter.cpp
+++ b/packages/amesos2/src/Amesos2_EpetraCrsMatrix_MatrixAdapter.cpp
@@ -7,8 +7,4 @@
 // *****************************************************************************
 // @HEADER
 
-#include "Amesos2_EpetraCrsMatrix_MatrixAdapter.hpp"
-
-#ifdef HAVE_AMESOS2_EXPLICIT_INSTANTIATION
 #include "Amesos2_EpetraCrsMatrix_MatrixAdapter_def.hpp"
-#endif  // HAVE_AMESOS2_EXPLICIT_INSTANTIATION
diff --git a/packages/amesos2/src/Amesos2_EpetraCrsMatrix_MatrixAdapter.hpp b/packages/amesos2/src/Amesos2_EpetraCrsMatrix_MatrixAdapter.hpp
index e62b220596f3..9b81e0047df1 100644
--- a/packages/amesos2/src/Amesos2_EpetraCrsMatrix_MatrixAdapter.hpp
+++ b/packages/amesos2/src/Amesos2_EpetraCrsMatrix_MatrixAdapter.hpp
@@ -11,8 +11,5 @@
 #define AMESOS2_EPETRACRSMATRIX_MATRIXADAPTER_HPP
 
 #include "Amesos2_EpetraCrsMatrix_MatrixAdapter_decl.hpp"
-#ifndef HAVE_AMESOS2_EXPLICIT_INSTANTIATION
-#  include "Amesos2_EpetraCrsMatrix_MatrixAdapter_def.hpp"
-#endif
 
 #endif  // AMESOS2_EPETRACRSMATRIX_MATRIXADAPTER_HPP
diff --git a/packages/amesos2/src/Amesos2_KLU2_decl.hpp b/packages/amesos2/src/Amesos2_KLU2_decl.hpp
index 0cf63fc0b8c9..c288c57a2e05 100644
--- a/packages/amesos2/src/Amesos2_KLU2_decl.hpp
+++ b/packages/amesos2/src/Amesos2_KLU2_decl.hpp
@@ -53,7 +53,6 @@ class KLU2 : public SolverCore<Amesos2::KLU2, Matrix, Vector>
   typedef typename super_type::local_ordinal_type        local_ordinal_type;
   typedef typename super_type::global_ordinal_type      global_ordinal_type;
   typedef typename super_type::global_size_type            global_size_type;
-  typedef typename super_type::node_type                          node_type;
 
   typedef TypeMap<Amesos2::KLU2,scalar_type>                    type_map;
 
diff --git a/packages/amesos2/src/Amesos2_KLU2_def.hpp b/packages/amesos2/src/Amesos2_KLU2_def.hpp
index 80c987d03760..1244a262230f 100644
--- a/packages/amesos2/src/Amesos2_KLU2_def.hpp
+++ b/packages/amesos2/src/Amesos2_KLU2_def.hpp
@@ -469,8 +469,9 @@ KLU2<Matrix,Vector>::loadA_impl(EPhase current_phase)
           nnz_ret = this->matrixA_->gather(host_nzvals_view_, host_rows_view_, host_col_ptr_view_, this->recvCounts, this->recvDispls, this->transpose_map, this->nzvals_t,
                                            column_major, current_phase);
         }
-	// gather failed (e.g., not implemened for KokkosCrsMatrix)
-	if (nnz_ret < 0) gather_supported = false;
+        // gather failed (e.g., not implemened for KokkosCrsMatrix)
+        // in case of the failure, it falls back to the original "do_get"
+        if (nnz_ret < 0) gather_supported = false;
       }
       if (!gather_supported) {
         Util::get_ccs_helper_kokkos_view<
diff --git a/packages/amesos2/src/Amesos2_ShyLUBasker_def.hpp b/packages/amesos2/src/Amesos2_ShyLUBasker_def.hpp
index 1a05243b3480..9b2a64cee1b9 100644
--- a/packages/amesos2/src/Amesos2_ShyLUBasker_def.hpp
+++ b/packages/amesos2/src/Amesos2_ShyLUBasker_def.hpp
@@ -604,6 +604,7 @@ ShyLUBasker<Matrix,Vector>::loadA_impl(EPhase current_phase)
                                            column_major, current_phase);
         }
         // gather failed (e.g., not implemened for KokkosCrsMatrix)
+        // in case of the failure, it falls back to the original "do_get"
         if (nnz_ret < 0) gather_supported = false;
       } 
       if (!gather_supported) {