diff --git a/bin/bcoin-cli b/bin/bcoin-cli
index be463926..29abe6b9 100755
--- a/bin/bcoin-cli
+++ b/bin/bcoin-cli
@@ -3,7 +3,7 @@
 var argv = parseArg(process.argv);
 
 var bcoin = require('../').set(argv.network);
-var network = bcoin.protocol.network;
+var network = bcoin.network.get();
 var utils = bcoin.utils;
 var assert = utils.assert;
 var Client = bcoin.http.client;
diff --git a/lib/bcoin/env.js b/lib/bcoin/env.js
index a87966d9..d5818e17 100644
--- a/lib/bcoin/env.js
+++ b/lib/bcoin/env.js
@@ -202,6 +202,9 @@ Environment.prototype.set = function set(options) {
   if (typeof options === 'string')
     options = { network: options };
 
+  if (!options)
+    options = {};
+
   options = utils.merge({}, options);
 
   options.prefix = options.prefix
diff --git a/lib/bcoin/http/client.js b/lib/bcoin/http/client.js
index a38abfba..772da0c1 100644
--- a/lib/bcoin/http/client.js
+++ b/lib/bcoin/http/client.js
@@ -26,6 +26,9 @@ function HTTPClient(options) {
   if (!options)
     options = {};
 
+  if (typeof options === 'string')
+    options = { uri: options };
+
   EventEmitter.call(this);
 
   this.uri = options.uri;
diff --git a/lib/bcoin/http/index.js b/lib/bcoin/http/index.js
index 15defd2f..bd7f4bd5 100644
--- a/lib/bcoin/http/index.js
+++ b/lib/bcoin/http/index.js
@@ -8,8 +8,8 @@
 var utils = require('../utils');
 
 exports.request = require('./request');
-exports.provider = require('./provider');
 exports.client = require('./client');
+exports.provider = require('./provider');
 
 if (!utils.isBrowser) {
   exports.base = require('./ba' + 'se');
diff --git a/lib/bcoin/http/provider.js b/lib/bcoin/http/provider.js
index c1a42a3e..24a8dcc8 100644
--- a/lib/bcoin/http/provider.js
+++ b/lib/bcoin/http/provider.js
@@ -26,9 +26,15 @@ function HTTPProvider(options) {
 
   EventEmitter.call(this);
 
+  if (!options)
+    options = {};
+
+  if (typeof options === 'string')
+    options = { uri: options };
+
   this.client = new HTTPClient(options);
   this.network = bcoin.network.get(options.network);
-  this.uri = uri;
+  this.uri = options.uri;
   this.id = null;
   this._init();
 }
diff --git a/lib/bcoin/tx.js b/lib/bcoin/tx.js
index 342008ff..705286a6 100644
--- a/lib/bcoin/tx.js
+++ b/lib/bcoin/tx.js
@@ -101,10 +101,10 @@ TX.prototype.clone = function clone() {
 
   copy = {
     version: this.version,
+    flag: this.flag,
     inputs: [],
     outputs: [],
     locktime: this.locktime,
-    flag: this.flag,
     ts: this.ts,
     block: this.block,
     index: this.index,