diff --git a/networking/tls_pstm.c b/networking/tls_pstm.c
index bd5bae0b7..e12e6c9d4 100644
--- a/networking/tls_pstm.c
+++ b/networking/tls_pstm.c
@@ -2127,7 +2127,7 @@ int32 pstm_invmod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c)
 {
 	pstm_int	x, y, u, v, B, D;
 	int32		res;
-	uint16		neg, sanity;
+	int		neg, sanity; //bbox: was uint16
 
 	/* 2. [modified] b must be odd   */
 	if (pstm_iseven (b) == 1) {
diff --git a/networking/tls_pstm_montgomery_reduce.c b/networking/tls_pstm_montgomery_reduce.c
index dc2fe0a48..3391755e1 100644
--- a/networking/tls_pstm_montgomery_reduce.c
+++ b/networking/tls_pstm_montgomery_reduce.c
@@ -345,7 +345,7 @@ int32 pstm_montgomery_reduce(psPool_t *pool, pstm_int *a, pstm_int *m,
 {
 	pstm_digit	*c, *_c, *tmpm, mu;
 	int32		oldused, x, y;
-	int16		pa;
+	int		pa; //bbox: was int16
 
 	pa = m->used;
 	if (pa > a->alloc) {
diff --git a/networking/tls_pstm_mul_comba.c b/networking/tls_pstm_mul_comba.c
index 845ab95e2..6ba152bc1 100644
--- a/networking/tls_pstm_mul_comba.c
+++ b/networking/tls_pstm_mul_comba.c
@@ -229,7 +229,7 @@ asm(                               \
 static int32 pstm_mul_comba_gen(psPool_t *pool, pstm_int *A, pstm_int *B,
 			pstm_int *C, pstm_digit *paD, uint32 paDlen)
 {
-	int16		paDfail, pa;
+	int		paDfail, pa; //bbox: was int16
 	int32       ix, iy, iz, tx, ty;
 	pstm_digit	c0, c1, c2, *tmpx, *tmpy, *dst;
 
diff --git a/networking/tls_pstm_sqr_comba.c b/networking/tls_pstm_sqr_comba.c
index 4fcfcf91a..d5c74d2f0 100644
--- a/networking/tls_pstm_sqr_comba.c
+++ b/networking/tls_pstm_sqr_comba.c
@@ -447,7 +447,7 @@ asm(                               \
 static int32 pstm_sqr_comba_gen(psPool_t *pool, pstm_int *A, pstm_int *B,
 			pstm_digit *paD, uint32 paDlen)
 {
-	int16		paDfail, pa;
+	int		paDfail, pa; //bbox: was int16
 	int32       ix, iz;
 	pstm_digit  c0, c1, c2, *dst;
 #ifdef PSTM_ISO