diff --git a/src/cc/makecclib b/src/cc/makecclib
index e9a015e2f..0d82463c4 100755
--- a/src/cc/makecclib
+++ b/src/cc/makecclib
@@ -7,7 +7,10 @@ make -f Makefile_rogue
 rm ../libcc.so 
 cp librogue.so ../libcc.so
 
-exit 0
+if [ "${LABS_FLAGS}" = "ENABLE_LABS" ]
+then
+    exit 
+fi
 
 echo sudoku/musig/dilithium
 gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o sudokucc.so cclib.cpp
diff --git a/src/wallet/db.h b/src/wallet/db.h
index f23122830..3aaf3d34b 100644
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@@ -33,9 +33,11 @@
 
 #include <boost/filesystem/path.hpp>
 
-// If CCLIB fails to compile with this, use the one below. 
-//#include <db_cxx.h>
-#include "../depends/x86_64-unknown-linux-gnu/include/db_cxx.h"
+#ifdef BUILD_ROGUE
+    #include "../depends/x86_64-unknown-linux-gnu/include/db_cxx.h"
+#else
+    #include <db_cxx.h>
+#endif
 
 extern unsigned int nWalletDBUpdated;