diff --git a/src/komodo.h b/src/komodo.h
index 73aa18753..b59fcd08c 100644
--- a/src/komodo.h
+++ b/src/komodo.h
@@ -165,7 +165,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar
                 errs++;
             if ( fwrite(opretbuf,1,opretlen,fp) != opretlen )
                 errs++;
-            komodo_opreturn(height,value,opretbuf,opretlen);
+            komodo_opreturn(height,opretvalue,opretbuf,opretlen);
         }
         else if ( notarypubs != 0 && numnotaries > 0 )
         {
diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 56351fe5b..d24afdc81 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -19,7 +19,7 @@
 
 const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int32_t opretlen)
 {
-    uint8_t rmd160[20],addrtype,shortflag,pubkey33[33]; char base[4],coinaddr[64],destaddr[64]; int64_t fiatoshis,checktoshis; const char *typestr = "unknown";
+    uint8_t rmd160[20],addrtype,shortflag,pubkey33[33]; int32_t i; char base[4],coinaddr[64],destaddr[64]; int64_t fiatoshis,checktoshis; const char *typestr = "unknown";
     if ( opretbuf[0] == 'D' )
     {
         if ( opretlen == 34 )
diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 5d73ad053..45ac9123d 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -310,7 +310,6 @@ void komodo_paxpricefeed(int32_t height,uint8_t *pricefeed,int32_t opretlen)
 uint64_t PAX_fiatdest(char *destaddr,uint8_t pubkey33[33],char *coinaddr,int32_t height,char *origbase,int64_t fiatoshis)
 {
     uint8_t shortflag = 0; char base[4]; int32_t i; uint8_t addrtype,rmd160[20]; uint64_t komodoshis = 0;
-    fiatbuf[0] = 0;
     if ( strcmp(base,(char *)"KMD") == 0 || strcmp(base,(char *)"kmd") == 0 )
         return(0);
     for (i=0; i<3; i++)