diff --git a/src/cc/CoinbaseGuard.cpp b/src/cc/CoinbaseGuard.cpp
index 42ac0c598..37cac9162 100644
--- a/src/cc/CoinbaseGuard.cpp
+++ b/src/cc/CoinbaseGuard.cpp
@@ -296,12 +296,12 @@ bool CoinbaseGuardValidate(struct CCcontract_info *cp, Eval* eval, const CTransa
 
     if (GetCCParams(eval, tx, nIn, txOut, preConditions, params))
     {
-
         if (preConditions.size() > 0 && params.size() > 0)
         {
             COptCCParams ccp = COptCCParams(preConditions[1]);
         }
 
+        // if we 
 
         // check any applicable time lock
         // determine who signed
diff --git a/src/komodo_globals.h b/src/komodo_globals.h
index 121b5ead6..4059daae5 100644
--- a/src/komodo_globals.h
+++ b/src/komodo_globals.h
@@ -62,8 +62,8 @@ int64_t MAX_MONEY = 200000000 * 100000000LL;
 // to be verifiable, timelocks require additional data that enables them to be validated and their ownership and
 // release time determined from the blockchain. to do this, every time locked output according to this
 // spec will use an op_return with CLTV at front and anything after |OP_RETURN|PUSH of rest|OPRETTYPE_TIMELOCK|script|
-#define _ASSETCHAINS_TIMELOCKOFF -1
-int64_t ASSETCHAINS_TIMELOCKGTE = _ASSETCHAINS_TIMELOCKOFF;
+#define _ASSETCHAINS_TIMELOCKOFF 0xffffffffffffffff
+uint64_t ASSETCHAINS_TIMELOCKGTE = _ASSETCHAINS_TIMELOCKOFF;
 uint64_t ASSETCHAINS_TIMEUNLOCKFROM = 0, ASSETCHAINS_TIMEUNLOCKTO = 0;
 
 uint32_t ASSETCHAINS_LASTERA = 1;
diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index c1040b595..1b38034b9 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1724,7 +1724,7 @@ void komodo_args(char *argv0)
         }
         ASSETCHAINS_LASTERA -= 1;
 
-        ASSETCHAINS_TIMELOCKGTE = GetArg("-ac_timelockgte", _ASSETCHAINS_TIMELOCKOFF);
+        ASSETCHAINS_TIMELOCKGTE = (uint64_t)GetArg("-ac_timelockgte", _ASSETCHAINS_TIMELOCKOFF);
         ASSETCHAINS_TIMEUNLOCKFROM = GetArg("-ac_timeunlockfrom", 0);
         ASSETCHAINS_TIMEUNLOCKTO = GetArg("-ac_timeunlockto", 0);
         if ( ASSETCHAINS_TIMEUNLOCKFROM > ASSETCHAINS_TIMEUNLOCKTO )
diff --git a/src/metrics.cpp b/src/metrics.cpp
index 0c158dfa9..aafb114f2 100644
--- a/src/metrics.cpp
+++ b/src/metrics.cpp
@@ -24,7 +24,7 @@
 #endif
 #include <unistd.h>
 
-extern int64_t ASSETCHAINS_TIMELOCKGTE;
+extern uint64_t ASSETCHAINS_TIMELOCKGTE;
 extern uint32_t ASSETCHAINS_ALGO, ASSETCHAINS_VERUSHASH;
 int64_t komodo_block_unlocktime(uint32_t nHeight);
 
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 518fdf278..0f588324a 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -358,7 +358,7 @@ void CTxMemPool::remove(const CTransaction &origTx, std::list<CTransaction>& rem
     }
 }
 
-extern int64_t ASSETCHAINS_TIMELOCKGTE;
+extern uint64_t ASSETCHAINS_TIMELOCKGTE;
 int64_t komodo_block_unlocktime(uint32_t nHeight);
 
 void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags)
diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
index ff873ab03..ea019087b 100644
--- a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
+++ b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
@@ -36,7 +36,7 @@
 #include "paymentdisclosuredb.h"
 
 using namespace libzcash;
-extern int64_t ASSETCHAINS_TIMELOCKGTE;
+extern uint64_t ASSETCHAINS_TIMELOCKGTE;
 
 static int find_output(UniValue obj, int n) {
     UniValue outputMapValue = find_value(obj, "outputmap");