diff --git a/SRC/clamtsqr.f b/SRC/clamtsqr.f
index e5e28e2581..d4bc2448ee 100644
--- a/SRC/clamtsqr.f
+++ b/SRC/clamtsqr.f
@@ -72,7 +72,7 @@
 *> \verbatim
 *>          MB is INTEGER
 *>          The block size to be used in the blocked QR.
-*>          MB > N. (must be the same as DLATSQR)
+*>          MB > N. (must be the same as CLATSQR)
 *> \endverbatim
 *>
 *> \param[in] NB
@@ -87,7 +87,7 @@
 *>          A is COMPLEX array, dimension (LDA,K)
 *>          The i-th column must contain the vector which defines the
 *>          blockedelementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by DLATSQR in the first k columns of
+*>          returned by CLATSQR in the first k columns of
 *>          its array argument A.
 *> \endverbatim
 *>
@@ -214,7 +214,7 @@ SUBROUTINE CLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *     ..
 *     .. Local Scalars ..
       LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      INTEGER    I, II, KK, LW, CTR, Q
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -233,8 +233,10 @@ SUBROUTINE CLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
       RIGHT   = LSAME( SIDE, 'R' )
       IF (LEFT) THEN
         LW = N * NB
+        Q = M
       ELSE
         LW = M * NB
+        Q = N
       END IF
 *
       INFO = 0
@@ -242,13 +244,15 @@ SUBROUTINE CLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
          INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
          INFO = -2
-      ELSE IF( M.LT.0 ) THEN
-        INFO = -3
-      ELSE IF( N.LT.0 ) THEN
-        INFO = -4
       ELSE IF( K.LT.0 ) THEN
         INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+      ELSE IF( N.LT.K ) THEN
+        INFO = -4
+      ELSE IF( M.LT.N ) THEN
+        INFO = -3
+      ELSE IF( K.LT.NB .OR. NB.LT.1 ) THEN
+        INFO = -7
+      ELSE IF( LDA.LT.MAX( 1, Q ) ) THEN
         INFO = -9
       ELSE IF( LDT.LT.MAX( 1, NB) ) THEN
         INFO = -11
diff --git a/SRC/dgemqrt.f b/SRC/dgemqrt.f
index 95c1a735c6..9191f7546a 100644
--- a/SRC/dgemqrt.f
+++ b/SRC/dgemqrt.f
@@ -94,7 +94,7 @@
 *>          NB is INTEGER
 *>          The block size used for the storage of T.  K >= NB >= 1.
 *>          This must be the same value of NB used to generate T
-*>          in CGEQRT.
+*>          in DGEQRT.
 *> \endverbatim
 *>
 *> \param[in] V
@@ -102,7 +102,7 @@
 *>          V is DOUBLE PRECISION array, dimension (LDV,K)
 *>          The i-th column must contain the vector which defines the
 *>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          CGEQRT in the first K columns of its array argument A.
+*>          DGEQRT in the first K columns of its array argument A.
 *> \endverbatim
 *>
 *> \param[in] LDV
@@ -117,7 +117,7 @@
 *> \verbatim
 *>          T is DOUBLE PRECISION array, dimension (LDT,K)
 *>          The upper triangular factors of the block reflectors
-*>          as returned by CGEQRT, stored as a NB-by-N matrix.
+*>          as returned by DGEQRT, stored as a NB-by-N matrix.
 *> \endverbatim
 *>
 *> \param[in] LDT
diff --git a/SRC/dlamtsqr.f b/SRC/dlamtsqr.f
index 776e24f52b..4fdd778cc9 100644
--- a/SRC/dlamtsqr.f
+++ b/SRC/dlamtsqr.f
@@ -214,7 +214,7 @@ SUBROUTINE DLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *     ..
 *     .. Local Scalars ..
       LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      INTEGER    I, II, KK, LW, CTR, Q
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -233,8 +233,10 @@ SUBROUTINE DLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
       RIGHT   = LSAME( SIDE, 'R' )
       IF (LEFT) THEN
         LW = N * NB
+        Q = M
       ELSE
         LW = MB * NB
+        Q = N
       END IF
 *
       INFO = 0
@@ -242,13 +244,15 @@ SUBROUTINE DLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
          INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
          INFO = -2
-      ELSE IF( M.LT.0 ) THEN
-        INFO = -3
-      ELSE IF( N.LT.0 ) THEN
-        INFO = -4
       ELSE IF( K.LT.0 ) THEN
         INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+      ELSE IF( N.LT.K ) THEN
+        INFO = -4
+      ELSE IF( M.LT.N ) THEN
+        INFO = -3
+      ELSE IF( K.LT.NB .OR. NB.LT.1 ) THEN
+        INFO = -7
+      ELSE IF( LDA.LT.MAX( 1, Q ) ) THEN
         INFO = -9
       ELSE IF( LDT.LT.MAX( 1, NB) ) THEN
         INFO = -11
diff --git a/SRC/sgemqrt.f b/SRC/sgemqrt.f
index 2ebd7d5f84..2dedfb2126 100644
--- a/SRC/sgemqrt.f
+++ b/SRC/sgemqrt.f
@@ -94,7 +94,7 @@
 *>          NB is INTEGER
 *>          The block size used for the storage of T.  K >= NB >= 1.
 *>          This must be the same value of NB used to generate T
-*>          in CGEQRT.
+*>          in SGEQRT.
 *> \endverbatim
 *>
 *> \param[in] V
@@ -102,7 +102,7 @@
 *>          V is REAL array, dimension (LDV,K)
 *>          The i-th column must contain the vector which defines the
 *>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          CGEQRT in the first K columns of its array argument A.
+*>          SGEQRT in the first K columns of its array argument A.
 *> \endverbatim
 *>
 *> \param[in] LDV
@@ -117,7 +117,7 @@
 *> \verbatim
 *>          T is REAL array, dimension (LDT,K)
 *>          The upper triangular factors of the block reflectors
-*>          as returned by CGEQRT, stored as a NB-by-N matrix.
+*>          as returned by SGEQRT, stored as a NB-by-N matrix.
 *> \endverbatim
 *>
 *> \param[in] LDT
diff --git a/SRC/slamtsqr.f b/SRC/slamtsqr.f
index 22eedfa78a..8f50a31488 100644
--- a/SRC/slamtsqr.f
+++ b/SRC/slamtsqr.f
@@ -27,7 +27,7 @@
 *> TRANS = 'T':      Q**T * C       C * Q**T
 *>      where Q is a real orthogonal matrix defined as the product
 *>      of blocked elementary reflectors computed by tall skinny
-*>      QR factorization (DLATSQR)
+*>      QR factorization (SLATSQR)
 *> \endverbatim
 *
 *  Arguments:
@@ -72,7 +72,7 @@
 *> \verbatim
 *>          MB is INTEGER
 *>          The block size to be used in the blocked QR.
-*>          MB > N. (must be the same as DLATSQR)
+*>          MB > N. (must be the same as SLATSQR)
 *> \endverbatim
 *>
 *> \param[in] NB
@@ -87,7 +87,7 @@
 *>          A is REAL array, dimension (LDA,K)
 *>          The i-th column must contain the vector which defines the
 *>          blockedelementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by DLATSQR in the first k columns of
+*>          returned by SLATSQR in the first k columns of
 *>          its array argument A.
 *> \endverbatim
 *>
@@ -214,7 +214,7 @@ SUBROUTINE SLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *     ..
 *     .. Local Scalars ..
       LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      INTEGER    I, II, KK, LW, CTR, Q
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -233,8 +233,10 @@ SUBROUTINE SLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
       RIGHT   = LSAME( SIDE, 'R' )
       IF (LEFT) THEN
         LW = N * NB
+        Q = M
       ELSE
         LW = MB * NB
+        Q = N
       END IF
 *
       INFO = 0
@@ -242,13 +244,15 @@ SUBROUTINE SLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
          INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
          INFO = -2
-      ELSE IF( M.LT.0 ) THEN
-        INFO = -3
-      ELSE IF( N.LT.0 ) THEN
-        INFO = -4
       ELSE IF( K.LT.0 ) THEN
         INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+      ELSE IF( N.LT.K ) THEN
+        INFO = -4
+      ELSE IF( M.LT.N ) THEN
+        INFO = -3
+      ELSE IF( K.LT.NB .OR. NB.LT.1 ) THEN
+        INFO = -7
+      ELSE IF( LDA.LT.MAX( 1, Q ) ) THEN
         INFO = -9
       ELSE IF( LDT.LT.MAX( 1, NB) ) THEN
         INFO = -11
diff --git a/SRC/zgemqrt.f b/SRC/zgemqrt.f
index 94e2890cf0..9547c33a57 100644
--- a/SRC/zgemqrt.f
+++ b/SRC/zgemqrt.f
@@ -94,7 +94,7 @@
 *>          NB is INTEGER
 *>          The block size used for the storage of T.  K >= NB >= 1.
 *>          This must be the same value of NB used to generate T
-*>          in CGEQRT.
+*>          in ZGEQRT.
 *> \endverbatim
 *>
 *> \param[in] V
@@ -102,7 +102,7 @@
 *>          V is COMPLEX*16 array, dimension (LDV,K)
 *>          The i-th column must contain the vector which defines the
 *>          elementary reflector H(i), for i = 1,2,...,k, as returned by
-*>          CGEQRT in the first K columns of its array argument A.
+*>          ZGEQRT in the first K columns of its array argument A.
 *> \endverbatim
 *>
 *> \param[in] LDV
@@ -117,7 +117,7 @@
 *> \verbatim
 *>          T is COMPLEX*16 array, dimension (LDT,K)
 *>          The upper triangular factors of the block reflectors
-*>          as returned by CGEQRT, stored as a NB-by-N matrix.
+*>          as returned by ZGEQRT, stored as a NB-by-N matrix.
 *> \endverbatim
 *>
 *> \param[in] LDT
diff --git a/SRC/zlamtsqr.f b/SRC/zlamtsqr.f
index 4225c51c5a..ae0b1833ab 100644
--- a/SRC/zlamtsqr.f
+++ b/SRC/zlamtsqr.f
@@ -72,7 +72,7 @@
 *> \verbatim
 *>          MB is INTEGER
 *>          The block size to be used in the blocked QR.
-*>          MB > N. (must be the same as DLATSQR)
+*>          MB > N. (must be the same as ZLATSQR)
 *> \endverbatim
 *>
 *> \param[in] NB
@@ -87,7 +87,7 @@
 *>          A is COMPLEX*16 array, dimension (LDA,K)
 *>          The i-th column must contain the vector which defines the
 *>          blockedelementary reflector H(i), for i = 1,2,...,k, as
-*>          returned by DLATSQR in the first k columns of
+*>          returned by ZLATSQR in the first k columns of
 *>          its array argument A.
 *> \endverbatim
 *>
@@ -214,7 +214,7 @@ SUBROUTINE ZLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
 *     ..
 *     .. Local Scalars ..
       LOGICAL    LEFT, RIGHT, TRAN, NOTRAN, LQUERY
-      INTEGER    I, II, KK, LW, CTR
+      INTEGER    I, II, KK, LW, CTR, Q
 *     ..
 *     .. External Functions ..
       LOGICAL            LSAME
@@ -233,8 +233,10 @@ SUBROUTINE ZLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
       RIGHT   = LSAME( SIDE, 'R' )
       IF (LEFT) THEN
         LW = N * NB
+        Q = M
       ELSE
         LW = M * NB
+        Q = N
       END IF
 *
       INFO = 0
@@ -242,13 +244,15 @@ SUBROUTINE ZLAMTSQR( SIDE, TRANS, M, N, K, MB, NB, A, LDA, T,
          INFO = -1
       ELSE IF( .NOT.TRAN .AND. .NOT.NOTRAN ) THEN
          INFO = -2
-      ELSE IF( M.LT.0 ) THEN
-        INFO = -3
-      ELSE IF( N.LT.0 ) THEN
-        INFO = -4
       ELSE IF( K.LT.0 ) THEN
         INFO = -5
-      ELSE IF( LDA.LT.MAX( 1, K ) ) THEN
+      ELSE IF( N.LT.K ) THEN
+        INFO = -4
+      ELSE IF( M.LT.N ) THEN
+        INFO = -3
+      ELSE IF( K.LT.NB .OR. NB.LT.1 ) THEN
+        INFO = -7
+      ELSE IF( LDA.LT.MAX( 1, Q ) ) THEN
         INFO = -9
       ELSE IF( LDT.LT.MAX( 1, NB) ) THEN
         INFO = -11