diff --git a/SP5WWP/m17-decoder/golay.c b/SP5WWP/m17-decoder/golay.c
index cef5df6..7370ac4 100644
--- a/SP5WWP/m17-decoder/golay.c
+++ b/SP5WWP/m17-decoder/golay.c
@@ -40,7 +40,7 @@ uint16_t SoftToInt(const uint16_t* in, uint8_t len)
 //result=a/b
 uint16_t Div16(uint16_t a, uint16_t b)
 {
-	uint32_t aa=a<<16;
+	uint32_t aa=(uint32_t)a<<16;
 	uint32_t r=aa/b;
 
 	if(r<=0xFFFF)
diff --git a/SP5WWP/m17-decoder/viterbi.c b/SP5WWP/m17-decoder/viterbi.c
index afcc2b8..1c1824a 100644
--- a/SP5WWP/m17-decoder/viterbi.c
+++ b/SP5WWP/m17-decoder/viterbi.c
@@ -162,7 +162,7 @@ uint32_t chainback(uint8_t* out, size_t pos, uint16_t len)
 
     memset(out, 0, (len-1)/8+1);
 
-    while(bitPos > 0)
+    while(pos > 0)
     {
         bitPos--;
         pos--;