diff --git a/lib/network.py b/lib/network.py
index cd038800..b98b2041 100644
--- a/lib/network.py
+++ b/lib/network.py
@@ -982,10 +982,10 @@ class Network(util.DaemonThread):
         filename = b.path()
         def download_thread():
             try:
-                import urllib, socket
+                import urllib.request, socket
                 socket.setdefaulttimeout(30)
                 self.print_error("downloading ", bitcoin.HEADERS_URL)
-                urllib.urlretrieve(bitcoin.HEADERS_URL, filename + '.tmp')
+                urllib.request.urlretrieve(bitcoin.HEADERS_URL, filename + '.tmp')
                 os.rename(filename + '.tmp', filename)
                 self.print_error("done.")
             except Exception:
diff --git a/lib/transaction.py b/lib/transaction.py
index fc3ac627..39a45a37 100644
--- a/lib/transaction.py
+++ b/lib/transaction.py
@@ -591,6 +591,8 @@ class Transaction:
             return addr
         elif output_type == TYPE_ADDRESS:
             return bitcoin.address_to_script(addr)
+        elif output_type == TYPE_PUBKEY:
+            return addr
         else:
             raise TypeError('Unknown output type')
         return script