diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index 15562669d..3e53b79c9 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1317,9 +1317,9 @@ void komodo_configfile(char *symbol,uint16_t port)
         sprintf(buf,"%s.conf",symbol);
         BITCOIND_PORT = port;
 #ifdef WIN32
-        sprintf(fname,"%s\\%s",GetDataDir(false).string().c_str(),buf);
+        sprintf(fname,"%s\\assets\\%s",GetDataDir(false).string().c_str(),buf);
 #else
-        sprintf(fname,"%s/%s",GetDataDir(false).string().c_str(),buf);
+        sprintf(fname,"%s/assets/%s",GetDataDir(false).string().c_str(),buf);
 #endif
         if ( (fp= fopen(fname,"rb")) == 0 )
         {
diff --git a/src/main.cpp b/src/main.cpp
index fe832ac0f..8e8223c1f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -550,7 +550,6 @@ CBlockTreeDB *pblocktree = NULL;
 
 // Komodo globals
 
-#define KOMODO_TESTNET_EXPIRATION 100000
 #define KOMODO_PAX
 #define KOMODO_ZCASH
 #include "komodo.h"
@@ -2155,8 +2154,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     }
 
     bool fScriptChecks = (!fCheckpointsEnabled || pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints()));
-    if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet"
-        return(false);
+    //if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet"
+    //    return(false);
     // Do not allow blocks that contain transactions which 'overwrite' older transactions,
     // unless those are already completely spent.
     BOOST_FOREACH(const CTransaction& tx, block.vtx) {
diff --git a/src/util.cpp b/src/util.cpp
index 4dfe13919..aec973cb6 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -526,7 +526,8 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
         path /= BaseParams().DataDir();
 
     fs::create_directories(path);
-
+    std::string assetpath = path + "/assets";
+    boost::filesystem::create_directory(assetpath);
     return path;
 }