diff --git a/packages/belos/src/BelosStatusTestGenResNorm.hpp b/packages/belos/src/BelosStatusTestGenResNorm.hpp
index 4b9d11e664c5..d5c7860dc5d2 100644
--- a/packages/belos/src/BelosStatusTestGenResNorm.hpp
+++ b/packages/belos/src/BelosStatusTestGenResNorm.hpp
@@ -541,12 +541,8 @@ StatusType StatusTestGenResNorm<ScalarType,MV,OP>::checkStatus( Iteration<Scalar
       // Check if this index is valid
       if (*p != -1) {
         // Scale the std::vector accordingly
-        if ( scalevector_[ *p ] != zero ) {
-          // Don't intentionally divide by zero.
-          testvector_[ *p ] = resvector_[ *p ] / scalevector_[ *p ] / scalevalue_;
-        } else {
-          testvector_[ *p ] = resvector_[ *p ] / scalevalue_;
-        }
+        testvector_[ *p ] =
+            scalevector_[ *p ] != zero? resvector_[ *p ] / (scalevector_[ *p ] * scalevalue_) : resvector_[ *p ] / scalevalue_;
       }
     }
   }
diff --git a/packages/ifpack2/src/Ifpack2_Relaxation_def.hpp b/packages/ifpack2/src/Ifpack2_Relaxation_def.hpp
index 502fb9f08515..8fba6eb13cef 100644
--- a/packages/ifpack2/src/Ifpack2_Relaxation_def.hpp
+++ b/packages/ifpack2/src/Ifpack2_Relaxation_def.hpp
@@ -1119,9 +1119,10 @@ void Relaxation<MatrixType>::compute ()
     // Teuchos::ScalarTraits when its template parameter is not a
     // floating-point type.  (Ifpack2 sometimes gets instantiated for
     // integer Scalar types.)
-    const IST oneOverMinDiagVal = (MinDiagonalValue_ == zero) ?
-      KAT::one () / static_cast<IST> (SmallTraits<scalar_type>::eps ()) :
-      KAT::one () / static_cast<IST> (MinDiagonalValue_);
+    IST oneOverMinDiagVal = KAT::one () / static_cast<IST> (SmallTraits<scalar_type>::eps ());
+    if ( MinDiagonalValue_ != zero) 
+      oneOverMinDiagVal = KAT::one () / static_cast<IST> (MinDiagonalValue_);
+      
     // It's helpful not to have to recompute this magnitude each time.
     const magnitude_type minDiagValMag = STS::magnitude (MinDiagonalValue_);