diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.cpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.cpp
index aefeb45600ab..9566e9c847a5 100644
--- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.cpp
+++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.cpp
@@ -217,7 +217,7 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
   //
   typedef Tpetra::Map<LO, GO, Node>         map_type;
   typedef Tpetra::Export<LO, GO, Node>      export_type;
-  //typedef Tpetra::Import<LO, GO, Node>    import_type; // unused
+  //typedef Tpetra::Import<LO, GO, Node>      import_type; // unused
   typedef Tpetra::CrsGraph<LO, GO, Node>    sparse_graph_type;
 
   // Number of independent variables fixed at 3
@@ -615,7 +615,7 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
     int oidx = 0;
     for (int i = 0; i < numNodes; ++i) {
       if (nodeIsOwned[i]) {
-        ownedGIDs[oidx] = as<int> (globalNodeIds[i]);
+        ownedGIDs[oidx] = as<GO> (globalNodeIds[i]);
 
         coordXArray[oidx] = nodeCoord(i,0);
         coordYArray[oidx] = nodeCoord(i,1);
@@ -708,9 +708,9 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
           // relative to the cell DoF numbering
           for (int cellCol = 0; cellCol < numFieldsG; ++cellCol) {
             int localCol  = elemToNode (cell, cellCol);
-            GO globalCol = globalNodeIds[localCol];
+            GO globalCol = as<GO> (globalNodeIds[localCol]);
             //create ArrayView globalCol object for Tpetra
-            ArrayView<const GO> globalColAV = arrayView (&globalCol, 1);
+            ArrayView<GO> globalColAV = arrayView (&globalCol, 1);
 
             //Update Tpetra overlap Graph
             overlappedGraph->insertGlobalIndices (globalRowT, globalColAV);
diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.hpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.hpp
index aaabab30b78e..73de211e616f 100644
--- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.hpp
+++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.hpp
@@ -81,9 +81,9 @@ namespace TpetraIntrepidPoissonExample {
 // besides the default.
 //
 typedef double ST;
-typedef int    LO;
-typedef Tpetra::Map<>::global_ordinal_type GO;
-typedef Tpetra::Map<>::node_type           Node;
+typedef Tpetra::Map<>::local_ordinal_type   LO;
+typedef Tpetra::Map<>::global_ordinal_type  GO;
+typedef Tpetra::Map<>::node_type Node;
 
 //
 // mfh 19 Apr 2012: If you want to change the template parameters of
diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.cpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.cpp
index 006054450f18..ce21b6a98efd 100644
--- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.cpp
+++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.cpp
@@ -617,7 +617,7 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
     int oidx = 0;
     for (int i = 0; i < numNodes; ++i) {
       if (nodeIsOwned[i]) {
-        ownedGIDs[oidx] = as<int> (globalNodeIds[i]);
+        ownedGIDs[oidx] = as<GO> (globalNodeIds[i]);
 
         coordXArray[oidx] = nodeCoord(i,0);
         coordYArray[oidx] = nodeCoord(i,1);
@@ -710,7 +710,7 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
           // relative to the cell DoF numbering
           for (int cellCol = 0; cellCol < numFieldsG; ++cellCol) {
             int localCol  = elemToNode (cell, cellCol);
-            GO globalCol = globalNodeIds[localCol];
+            GO globalCol = as<GO> (globalNodeIds[localCol]);
             //create ArrayView globalCol object for Tpetra
             ArrayView<GO> globalColAV = arrayView (&globalCol, 1);
 
diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.hpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.hpp
index d4408cc529ee..38eb40a8c12b 100644
--- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.hpp
+++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.hpp
@@ -80,10 +80,10 @@ namespace TpetraIntrepidPoissonExample {
 // double and LO,GO = int, but it probably works for other Node types
 // besides the default.
 //
-typedef double                             ST;
-typedef int                                LO;
-typedef Tpetra::Map<>::global_ordinal_type GO;
-typedef Tpetra::Map<>::node_type           Node;
+typedef double ST;
+typedef Tpetra::Map<>::local_ordinal_type    LO;
+typedef Tpetra::Map<>::global_ordinal_type   GO;
+typedef Tpetra::Map<>::node_type Node;
 
 //
 // mfh 19 Apr 2012: If you want to change the template parameters of
diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.cpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.cpp
index 0072c7cbc37a..06662777134c 100644
--- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.cpp
+++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.cpp
@@ -702,9 +702,9 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
           // relative to the cell DoF numbering
           for (int cellCol = 0; cellCol < numFieldsG; ++cellCol) {
             int localCol  = elemToNode (cell, cellCol);
-            GO globalCol = globalNodeIds[localCol];
+            GO globalCol = as<GO> (globalNodeIds[localCol]);
             //create ArrayView globalCol object for Tpetra
-            ArrayView<const GO> globalColAV = arrayView (&globalCol, 1);
+            ArrayView<GO> globalColAV = arrayView (&globalCol, 1);
 
             //Update Tpetra overlap Graph
             overlappedGraph->insertGlobalIndices (globalRowT, globalColAV);
diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.hpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.hpp
index 6da03a153f27..50b01f14994d 100644
--- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.hpp
+++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.hpp
@@ -79,10 +79,10 @@ namespace TpetraIntrepidPoissonExample {
 // double and LO,GO = int, but it probably works for other Node types
 // besides the default.
 //
-typedef double                             ST;
-typedef int                                LO;
-typedef Tpetra::Map<>::global_ordinal_type GO;
-typedef Tpetra::Map<>::node_type           Node;
+typedef double ST;
+typedef Tpetra::Map<>::local_ordinal_type    LO;
+typedef Tpetra::Map<>::global_ordinal_type    GO;
+typedef Tpetra::Map<>::node_type  Node;
 typedef Teuchos::ScalarTraits<ST> STS;
 typedef STS::magnitudeType MT;