diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index 07296466b..546fa8a13 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -13,8 +13,6 @@
  *                                                                            *
  ******************************************************************************/
 #include "komodo_defs.h"
-#include "cc/utils.h"
-#include "cc/CCinclude.h"
 
 #ifdef _WIN32
 #include <sodium.h>
diff --git a/src/main.cpp b/src/main.cpp
index e272adff8..c5d2db923 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1062,9 +1062,12 @@ int32_t komodo_isnotaryvout(char *coinaddr) // from ac_private chains only
         }
         didinit = 1;
     } */
-    for (int32_t i=0; i<=64; i++)
-        if ( strcmp(coinaddr,NOTARYADDRS[i]) == 0 )
-            return(1);
+    if ( NOTARYADDRS[0][0] != 0 )
+    {
+        for (int32_t i=0; i<=64; i++)
+            if ( strcmp(coinaddr,NOTARYADDRS[i]) == 0 )
+                return(1);
+    }
     return(0);
 }
 
@@ -1218,7 +1221,7 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
             }
         }
     }
-   
+
     // Ensure input values do not exceed MAX_MONEY
     // We have not resolved the txin values at this stage,
     // but we do know what the joinsplits claim to add