diff --git a/extmod/secp256k1mod.c b/extmod/secp256k1mod.c
index a7762e31..d8ff9b73 100755
--- a/extmod/secp256k1mod.c
+++ b/extmod/secp256k1mod.c
@@ -16,6 +16,7 @@
   this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <secp256k1.h>
 
diff --git a/mmgen/cfg.py b/mmgen/cfg.py
index 092ac6ae..41f5e235 100755
--- a/mmgen/cfg.py
+++ b/mmgen/cfg.py
@@ -40,7 +40,6 @@ class CfgFile(object):
 	warn_missing = True
 	write_metadata = False
 	fn_base = g.proj_name.lower() + '.cfg'
-	file_not_found_fs = 'WARNING: {} not found at {!r}'
 	line_data = namedtuple('cfgfile_line',['name','value','lineno','chunk'])
 
 	class warn_missing_file(oneshot_warning):
@@ -99,7 +98,6 @@ class CfgFile(object):
 			'usr':    CfgFileUsr,
 			'sys':    CfgFileSampleSys,
 			'sample': CfgFileSampleUsr,
-			'dist':   CfgFileSampleDist,
 		}
 		return d[id_str]
 
@@ -179,10 +177,6 @@ class CfgFileUsr(CfgFile):
 		if not self.data:
 			self.copy_data()
 
-class CfgFileSampleDist(CfgFileSample):
-	desc = 'source distribution configuration file'
-	fn_dir = 'data_files'
-
 class CfgFileSampleSys(CfgFileSample):
 	desc = 'system sample configuration file'
 	test_fn_subdir = 'usr.local.share'
diff --git a/scripts/create-token.py b/scripts/create-token.py
index 30485732..191842c5 100755
--- a/scripts/create-token.py
+++ b/scripts/create-token.py
@@ -26,7 +26,7 @@ class TokenData:
 	fields = ('decimals','supply','name','symbol','owner_addr')
 	decimals   = ti('18', int, lambda s: s.isascii() and s.isdigit() and 0 < int(s) <= 36)
 	name       = ti(None, str, lambda s: s.isascii() and s.isprintable() and len(s) < 256)
-	supply     = ti(None, int, lambda s: s.isascii() and s.isdigit() and 0 < int(s) <= 2**256 - 1)
+	supply     = ti(None, int, lambda s: s.isascii() and s.isdigit() and 0 < int(s) < 2**256)
 	symbol     = ti(None, str, lambda s: s.isascii() and s.isalnum() and len(s) <= 20)
 	owner_addr = ti(None, str, lambda s: s.isascii() and s.isalnum() and len(s) == 40) # checked separately
 
diff --git a/test/test_py_d/ts_cfg.py b/test/test_py_d/ts_cfg.py
index fda2d4dd..badee903 100755
--- a/test/test_py_d/ts_cfg.py
+++ b/test/test_py_d/ts_cfg.py
@@ -38,6 +38,9 @@ class TestSuiteCfg(TestSuiteBase):
 		os.environ['MMGEN_TEST_SUITE_CFGTEST'] = '1'
 		TestSuiteBase.__init__(self,trunner,cfgs,spawn)
 
+	def __del__(self):
+		os.environ['MMGEN_TEST_SUITE_CFGTEST'] = ''
+
 	def spawn_test(self,args=[],extra_desc=''):
 		return self.spawn(
 			'test/misc/cfg.py',