diff --git a/python/eth_contract_registry/runnable/deploy.py b/python/eth_contract_registry/runnable/deploy.py
index ae768a8..bedf6e1 100644
--- a/python/eth_contract_registry/runnable/deploy.py
+++ b/python/eth_contract_registry/runnable/deploy.py
@@ -57,8 +57,8 @@ if args.vv:
 elif args.v:
     logg.setLevel(logging.INFO)
 
-block_last = args.w
 block_all = args.ww
+block_last = args.w or block_all
 
 passphrase_env = 'ETH_PASSPHRASE'
 if args.env_prefix != None:
diff --git a/python/eth_contract_registry/runnable/list.py b/python/eth_contract_registry/runnable/list.py
index 4920f73..4b7b7c3 100644
--- a/python/eth_contract_registry/runnable/list.py
+++ b/python/eth_contract_registry/runnable/list.py
@@ -25,7 +25,7 @@ from chainlib.eth.constant import ZERO_CONTENT
 from chainlib.error import JSONRPCException
 
 # local imports
-from eth_contract_registry import Registry
+from eth_contract_registry.registry import ContractRegistry
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -88,7 +88,7 @@ def ls(ifc, fmt=default_format, w=sys.stdout):
 
 
 def main():
-    c = Registry(chain_spec)
+    c = ContractRegistry(chain_spec)
     if identifier != None:
         element(c, identifier, fmt=fmt, w=sys.stdout)
     else:
diff --git a/python/eth_contract_registry/runnable/set.py b/python/eth_contract_registry/runnable/set.py
index 4f33080..fd4282f 100644
--- a/python/eth_contract_registry/runnable/set.py
+++ b/python/eth_contract_registry/runnable/set.py
@@ -60,8 +60,8 @@ if args.vv:
 elif args.v:
     logg.setLevel(logging.INFO)
 
-block_last = args.w
 block_all = args.ww
+block_last = args.w or block_all
 
 passphrase_env = 'ETH_PASSPHRASE'
 if args.env_prefix != None:
diff --git a/python/gmon.out b/python/gmon.out
index 8714e2f..1cf71c8 100644
Binary files a/python/gmon.out and b/python/gmon.out differ