diff --git a/coreblas/compute/CMakeLists.txt b/coreblas/compute/CMakeLists.txt
index 82813231b0cd3e147e1e676142137ed312504136..d24bc295a5d2dc00e9e9cec7401742a3e2ee23ac 100644
--- a/coreblas/compute/CMakeLists.txt
+++ b/coreblas/compute/CMakeLists.txt
@@ -73,6 +73,8 @@ set(ZSRC
     core_zsyrk.c
     core_zsyssq.c
     core_zsytf2_nopiv.c
+    core_ztpqrt.c
+    core_ztpmqrt.c
     core_ztradd.c
     core_ztrasm.c
     core_ztrmm.c
diff --git a/coreblas/compute/core_ztpmqrt.c b/coreblas/compute/core_ztpmqrt.c
index 571da630afd9168a1eb64a95f2f637f39ed4ed73..ee44b8cf81e74de305a5885379e3b49477d86c00 100644
--- a/coreblas/compute/core_ztpmqrt.c
+++ b/coreblas/compute/core_ztpmqrt.c
@@ -148,8 +148,7 @@ int CORE_ztpmqrt( MORSE_enum side, MORSE_enum trans,
                   MORSE_Complex64_t *B, int LDB,
                   MORSE_Complex64_t *WORK )
 {
-    int m1;
-    int n1;
+    int m1, n1, ldwork;
 
     /* Check input arguments */
     if ((side != MorseLeft) && (side != MorseRight)) {
@@ -160,7 +159,7 @@ int CORE_ztpmqrt( MORSE_enum side, MORSE_enum trans,
     if ( side == MorseLeft ) {
         m1 = K;
         n1 = N;
-        ldwork = ib;
+        ldwork = IB;
     }
     else {
         m1 = M;
diff --git a/coreblas/compute/core_ztpqrt.c b/coreblas/compute/core_ztpqrt.c
index 76a94fc2cf08e7963255988ea5e093151b6d34dd..504951a0c6c5fd942760b21bad9fb94b9c2f6483 100644
--- a/coreblas/compute/core_ztpqrt.c
+++ b/coreblas/compute/core_ztpqrt.c
@@ -102,12 +102,6 @@ int CORE_ztpqrt( int M, int N, int L, int IB,
                  MORSE_Complex64_t *T, int LDT,
                  MORSE_Complex64_t *WORK )
 {
-    static MORSE_Complex64_t zone  = 1.0;
-    static MORSE_Complex64_t zzero = 0.0;
-
-    MORSE_Complex64_t alpha;
-    int i, ii, sb;
-
 #if !defined(NDEBUG)
      /* Check input arguments */
     if (M < 0) {
@@ -144,7 +138,7 @@ int CORE_ztpqrt( int M, int N, int L, int IB,
     if ((M == 0) || (N == 0) || (IB == 0))
         return MORSE_SUCCESS;
 
-    if ( L == O ) {
+    if ( L == 0 ) {
         CORE_ztsqrt( M, N, IB, A, LDA, B, LDB, T, LDT, WORK, WORK+N );
     }
     else if (L == M) {