diff --git a/ctaocrypt/src/asm.c b/ctaocrypt/src/asm.c
index e19410e8a..941478a42 100644
--- a/ctaocrypt/src/asm.c
+++ b/ctaocrypt/src/asm.c
@@ -1004,15 +1004,17 @@ __asm__(                              \
 
 #define SQRADDAC(i, j)                                                         \
    do { fp_word t;                                                             \
-   t = sc0 + ((fp_word)i) * ((fp_word)j);  sc0 = t;                            \
-   t = sc1 + (t >> DIGIT_BIT);             sc1 = t; sc2 += t >> DIGIT_BIT;     \
+   t = sc0 + ((fp_word)i) * ((fp_word)j);  sc0 =  (fp_digit)t;                 \
+   t = sc1 + (t >> DIGIT_BIT);             sc1 =  (fp_digit)t;                 \
+                                           sc2 += (fp_digit)(t >> DIGIT_BIT);  \
    } while (0);
 
 #define SQRADDDB                                                               \
    do { fp_word t;                                                             \
-   t = ((fp_word)sc0) + ((fp_word)sc0) + c0; c0 = t;                                                 \
-   t = ((fp_word)sc1) + ((fp_word)sc1) + c1 + (t >> DIGIT_BIT); c1 = t;                              \
-   c2 = c2 + ((fp_word)sc2) + ((fp_word)sc2) + (t >> DIGIT_BIT);                                     \
+   t = ((fp_word)sc0) + ((fp_word)sc0) + c0; c0 = (fp_digit)t;                 \
+   t = ((fp_word)sc1) + ((fp_word)sc1) + c1 + (t >> DIGIT_BIT);                \
+                                             c1 = (fp_digit)t;                 \
+   c2 = c2 + (fp_digit)(((fp_word)sc2) + ((fp_word)sc2) + (t >> DIGIT_BIT));   \
    } while (0);
 
 #endif
diff --git a/ctaocrypt/src/fp_sqr_comba_12.i b/ctaocrypt/src/fp_sqr_comba_12.i
index 7ecb7c9e1..2f068c7d9 100644
--- a/ctaocrypt/src/fp_sqr_comba_12.i
+++ b/ctaocrypt/src/fp_sqr_comba_12.i
@@ -24,7 +24,9 @@
 void fp_sqr_comba12(fp_int *A, fp_int *B)
 {
    fp_digit *a, b[24], c0, c1, c2, sc0, sc1, sc2;
-
+#ifdef TFM_ISO
+   fp_word tt;
+#endif
    a = A->dp;
    COMBA_START; 
 
diff --git a/ctaocrypt/src/fp_sqr_comba_17.i b/ctaocrypt/src/fp_sqr_comba_17.i
index fcd4daa5e..db34b1a78 100644
--- a/ctaocrypt/src/fp_sqr_comba_17.i
+++ b/ctaocrypt/src/fp_sqr_comba_17.i
@@ -24,6 +24,9 @@
 void fp_sqr_comba17(fp_int *A, fp_int *B)
 {
    fp_digit *a, b[34], c0, c1, c2, sc0, sc1, sc2;
+#ifdef TFM_ISO
+   fp_word tt;
+#endif
 
    a = A->dp;
    COMBA_START; 
diff --git a/ctaocrypt/src/fp_sqr_comba_3.i b/ctaocrypt/src/fp_sqr_comba_3.i
index 6cf7faf1a..fea21d183 100644
--- a/ctaocrypt/src/fp_sqr_comba_3.i
+++ b/ctaocrypt/src/fp_sqr_comba_3.i
@@ -24,6 +24,9 @@
 void fp_sqr_comba3(fp_int *A, fp_int *B)
 {
    fp_digit *a, b[6], c0, c1, c2;
+#ifdef TFM_ISO
+   fp_word tt;
+#endif
 
    a = A->dp;
    COMBA_START; 
diff --git a/ctaocrypt/src/fp_sqr_comba_4.i b/ctaocrypt/src/fp_sqr_comba_4.i
index 71c3c87af..7b7eefa6f 100644
--- a/ctaocrypt/src/fp_sqr_comba_4.i
+++ b/ctaocrypt/src/fp_sqr_comba_4.i
@@ -24,6 +24,9 @@
 void fp_sqr_comba4(fp_int *A, fp_int *B)
 {
    fp_digit *a, b[8], c0, c1, c2;
+#ifdef TFM_ISO
+   fp_word tt;
+#endif
 
    a = A->dp;
    COMBA_START; 
diff --git a/ctaocrypt/src/fp_sqr_comba_6.i b/ctaocrypt/src/fp_sqr_comba_6.i
index 189f339a4..dc7028138 100644
--- a/ctaocrypt/src/fp_sqr_comba_6.i
+++ b/ctaocrypt/src/fp_sqr_comba_6.i
@@ -24,6 +24,9 @@
 void fp_sqr_comba6(fp_int *A, fp_int *B)
 {
    fp_digit *a, b[12], c0, c1, c2, sc0, sc1, sc2;
+#ifdef TFM_ISO
+   fp_word tt;
+#endif
 
    a = A->dp;
    COMBA_START; 
diff --git a/ctaocrypt/src/fp_sqr_comba_7.i b/ctaocrypt/src/fp_sqr_comba_7.i
index 1a0cd2c19..7ba664e2f 100644
--- a/ctaocrypt/src/fp_sqr_comba_7.i
+++ b/ctaocrypt/src/fp_sqr_comba_7.i
@@ -24,6 +24,9 @@
 void fp_sqr_comba7(fp_int *A, fp_int *B)
 {
    fp_digit *a, b[14], c0, c1, c2, sc0, sc1, sc2;
+#ifdef TFM_ISO
+   fp_word tt;
+#endif
 
    a = A->dp;
    COMBA_START; 
diff --git a/ctaocrypt/src/fp_sqr_comba_8.i b/ctaocrypt/src/fp_sqr_comba_8.i
index b71feae3b..24efa52cb 100644
--- a/ctaocrypt/src/fp_sqr_comba_8.i
+++ b/ctaocrypt/src/fp_sqr_comba_8.i
@@ -24,6 +24,9 @@
 void fp_sqr_comba8(fp_int *A, fp_int *B)
 {
    fp_digit *a, b[16], c0, c1, c2, sc0, sc1, sc2;
+#ifdef TFM_ISO
+   fp_word   tt;   
+#endif   
 
    a = A->dp;
    COMBA_START; 
diff --git a/ctaocrypt/src/fp_sqr_comba_9.i b/ctaocrypt/src/fp_sqr_comba_9.i
index 1db06de22..e9cc21665 100644
--- a/ctaocrypt/src/fp_sqr_comba_9.i
+++ b/ctaocrypt/src/fp_sqr_comba_9.i
@@ -24,6 +24,9 @@
 void fp_sqr_comba9(fp_int *A, fp_int *B)
 {
    fp_digit *a, b[18], c0, c1, c2, sc0, sc1, sc2;
+#ifdef TFM_ISO
+   fp_word tt;
+#endif
 
    a = A->dp;
    COMBA_START;