diff --git a/lib/bcoin/peer.js b/lib/bcoin/peer.js
index 13d8fd43..b463123d 100644
--- a/lib/bcoin/peer.js
+++ b/lib/bcoin/peer.js
@@ -1537,23 +1537,19 @@ Peer.prototype._handleGetData = function _handleGetData(items) {
  */
 
 Peer.prototype._handleAddr = function _handleAddr(addrs) {
-  var hosts = [];
-  var i, addr;
+  var i;
 
-  for (i = 0; i < addrs.length; i++) {
-    addr = addrs[i];
-    this.addrFilter.add(addr.host, 'ascii');
-    hosts.push(addr);
-  }
+  for (i = 0; i < addrs.length; i++)
+    this.addrFilter.add(addrs[i].host, 'ascii');
 
   bcoin.debug(
     'Received %d addrs (hosts=%d, peers=%d) (%s).',
-    hosts.length,
+    addrs.length,
     this.pool.hosts.length,
     this.pool.peers.all.length,
     this.hostname);
 
-  this.fire('addr', hosts);
+  this.fire('addr', addrs);
 };
 
 /**
@@ -1681,8 +1677,11 @@ Peer.prototype._handleInv = function _handleInv(items) {
   if (txs.length > 0)
     this.emit('txs', txs);
 
-  if (unknown != null)
-    bcoin.debug('Peer sent an unknown inv type: %d (%s).', unknown);
+  if (unknown != null) {
+    bcoin.debug(
+      'Peer sent an unknown inv type: %d (%s).',
+      unknown, this.hostname);
+  }
 };
 
 /**
@@ -2043,7 +2042,7 @@ NetworkAddress.prototype.fromOptions = function fromOptions(options) {
   if (IP.version(host) !== -1)
     host = IP.normalize(host);
 
-  assert(typeof host === 'string');
+  assert(typeof options.host === 'string');
   assert(typeof options.port === 'number');
   assert(typeof options.services === 'number');
   assert(typeof options.ts === 'number');
diff --git a/lib/bcoin/protocol/framer.js b/lib/bcoin/protocol/framer.js
index 1c8610a5..3e91e6e5 100644
--- a/lib/bcoin/protocol/framer.js
+++ b/lib/bcoin/protocol/framer.js
@@ -628,7 +628,7 @@ Framer.tx = function _tx(tx, writer) {
  */
 
 Framer.witnessTX = function _witnessTX(tx, writer) {
-  return tx.toWitness(writer);
+  return tx.toRaw(writer);
 };
 
 /**
@@ -651,7 +651,7 @@ Framer.block = function _block(block, writer) {
  */
 
 Framer.witnessBlock = function _witnessBlock(block, writer) {
-  return block.toWitness(writer);
+  return block.toRaw(writer);
 };
 
 /**