diff --git a/src/komodo_validation015.h b/src/komodo_validation015.h
index 512a5d083..b9568ebdf 100644
--- a/src/komodo_validation015.h
+++ b/src/komodo_validation015.h
@@ -762,9 +762,9 @@ void komodo_importpubkeys()
 
 int32_t komodo_init()
 {
-    NOTARY_PUBKEY = gArgs.GetArg("-pubkey", "");
+    NOTARY_PUBKEY = GetArg("-pubkey", "");
     decode_hex(NOTARY_PUBKEY33,33,(char *)NOTARY_PUBKEY.c_str());
-    if ( gArgs.GetBoolArg("-txindex", DEFAULT_TXINDEX) == 0 )
+    if ( GetBoolArg("-txindex", DEFAULT_TXINDEX) == 0 )
     {
         fprintf(stderr,"txindex is off, import notary pubkeys\n");
         KOMODO_NEEDPUBKEYS = 1;
diff --git a/src/main.h b/src/main.h
index 3d270d2b5..eb045ae0e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -95,6 +95,7 @@ static const unsigned int DATABASE_FLUSH_INTERVAL = 24 * 60 * 60;
 /** Maximum length of reject messages. */
 static const unsigned int MAX_REJECT_MESSAGE_LENGTH = 111;
 
+static const bool DEFAULT_TXINDEX = false;
 static const bool DEFAULT_ADDRESSINDEX = false;
 static const bool DEFAULT_TIMESTAMPINDEX = false;
 static const bool DEFAULT_SPENTINDEX = false;