diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index e5345669b..ad935a691 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -902,7 +902,7 @@ int32_t komodo_opreturnscript(uint8_t *script,uint8_t type,uint8_t *opret,int32_
             script[offset++] = opretlen;
         }
     } else script[offset++] = opretlen;
-    script[offset++] = type;
+    script[offset] = type; // covered by opretlen
     memcpy(&script[offset],opret,opretlen);
     return(opretlen + offset);
 }
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 73da86f60..e4f9fc1c1 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -53,7 +53,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
         mTemplates.insert(make_pair(TX_MULTISIG, CScript() << OP_SMALLINTEGER << OP_PUBKEYS << OP_SMALLINTEGER << OP_CHECKMULTISIG));
 
         // Empty, provably prunable, data-carrying output
-        //if (GetBoolArg("-datacarrier", true))
+        if (GetBoolArg("-datacarrier", true))
             mTemplates.insert(make_pair(TX_NULL_DATA, CScript() << OP_RETURN << OP_SMALLDATA));
         mTemplates.insert(make_pair(TX_NULL_DATA, CScript() << OP_RETURN));
     }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index e85c5be6a..7f4a2e003 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -393,7 +393,11 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr
         opretpubkey.resize(opretlen);
         ptr = (uint8_t *)opretpubkey.data();
         for (i=0; i<opretlen; i++)
+        {
             ptr[i] = opretbuf[i];
+            printf("%02x",ptr[i]);
+        }
+        printf(" opretbuf[%d]\n",opretlen);
         CRecipient opret = { opretpubkey, opretValue, false };
         vecSend.push_back(opret);
     }