diff --git a/BLAS/TESTING/cblat3.f b/BLAS/TESTING/cblat3.f
index a8cd24c123..2f339f0801 100644
--- a/BLAS/TESTING/cblat3.f
+++ b/BLAS/TESTING/cblat3.f
@@ -3815,7 +3815,7 @@ SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
 *                          Generate the matrix C.
 *
-                           CALL CMAKE( 'GE', UPLO, ' ', M, N, C, NMAX,
+                           CALL CMAKE( 'GE', UPLO, ' ', N, N, C, NMAX,
      $                                 CC, LDC, RESET, ZERO )
 *
                            NC = NC + 1
@@ -3846,7 +3846,7 @@ SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *                          Call the subroutine.
 *
                            IF( TRACE )
-     $                        WRITE( NTRA, FMT = 9995 )NC, SNAME, UPLO
+     $                        WRITE( NTRA, FMT = 9995 )NC, SNAME, UPLO,
      $                        TRANSA, TRANSB, N, K, ALPHA, LDA, LDB,
      $                        BETA, LDC
                            IF( REWI )
@@ -3879,7 +3879,7 @@ SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
                            IF( NULL )THEN
                               ISAME( 12 ) = LCE( CS, CC, LCC )
                            ELSE
-                              ISAME( 12 ) = LCERES( 'GE', ' ', M, N, CS,
+                              ISAME( 12 ) = LCERES( 'GE', ' ', N, N, CS,
      $                                      CC, LDC )
                            END IF
                            ISAME( 13 ) = LDCS.EQ.LDC
diff --git a/BLAS/TESTING/dblat3.f b/BLAS/TESTING/dblat3.f
index ddfbbfbd6a..24c5eb7782 100644
--- a/BLAS/TESTING/dblat3.f
+++ b/BLAS/TESTING/dblat3.f
@@ -3145,7 +3145,7 @@ SUBROUTINE DCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
                            IF( NULL )THEN
                               ISAME( 12 ) = LDE( CS, CC, LCC )
                            ELSE
-                              ISAME( 12 ) = LDERES( 'GE', ' ', M, N,
+                              ISAME( 12 ) = LDERES( 'GE', ' ', N, N,
      $                                          CS, CC, LDC )
                            END IF
                            ISAME( 13 ) = LDCS.EQ.LDC
diff --git a/BLAS/TESTING/zblat3.f b/BLAS/TESTING/zblat3.f
index 9b54f6be8f..4debc77e02 100644
--- a/BLAS/TESTING/zblat3.f
+++ b/BLAS/TESTING/zblat3.f
@@ -3689,6 +3689,7 @@ SUBROUTINE XERBLA( SRNAME, INFO )
       SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
      $                  FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET, NMAX,
      $                  A, AA, AS, B, BB, BS, C, CC, CS, CT, G )
+      IMPLICIT NONE
 *
 *  Tests ZGEMMT.
 *
@@ -3829,7 +3830,7 @@ SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
 *                          Generate the matrix C.
 *
-                           CALL ZMAKE( 'GE', UPLO, ' ', M, N, C, NMAX,
+                           CALL ZMAKE( 'GE', UPLO, ' ', N, N, C, NMAX,
      $                                 CC, LDC, RESET, ZERO )
 *
                            NC = NC + 1
@@ -3860,7 +3861,7 @@ SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *                          Call the subroutine.
 *
                            IF( TRACE )
-     $                        WRITE( NTRA, FMT = 9995 )NC, SNAME, UPLO
+     $                        WRITE( NTRA, FMT = 9995 )NC, SNAME, UPLO,
      $                        TRANSA, TRANSB, N, K, ALPHA, LDA, LDB,
      $                        BETA, LDC
                            IF( REWI )
@@ -3893,7 +3894,7 @@ SUBROUTINE ZCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
                            IF( NULL )THEN
                               ISAME( 12 ) = LZE( CS, CC, LCC )
                            ELSE
-                              ISAME( 12 ) = LZERES( 'GE', ' ', M, N, CS,
+                              ISAME( 12 ) = LZERES( 'GE', ' ', N, N, CS,
      $                                      CC, LDC )
                            END IF
                            ISAME( 13 ) = LDCS.EQ.LDC
diff --git a/CMAKE/CheckLAPACKCompilerFlags.cmake b/CMAKE/CheckLAPACKCompilerFlags.cmake
index 11a5461927..828a9df159 100644
--- a/CMAKE/CheckLAPACKCompilerFlags.cmake
+++ b/CMAKE/CheckLAPACKCompilerFlags.cmake
@@ -150,8 +150,8 @@ if( "${CMAKE_Fortran_FLAGS_RELEASE}" MATCHES "O[3-9]" )
 endif()
 
 
-if( FPE_EXIT )
-  message( FATAL_ERROR "Floating Point Exception (FPE) trap handlers are currently explicitly enabled in the compiler flags.  LAPACK is designed to check for and handle these cases internally and enabling these traps will likely cause LAPACK to crash.  Please re-configure with floating point exception trapping disabled." )
-endif()
+# if( FPE_EXIT )
+  # message( FATAL_ERROR "Floating Point Exception (FPE) trap handlers are currently explicitly enabled in the compiler flags.  LAPACK is designed to check for and handle these cases internally and enabling these traps will likely cause LAPACK to crash.  Please re-configure with floating point exception trapping disabled." )
+# endif()
 
 endmacro()