diff --git a/glide.lock b/glide.lock
index f22157def..42ab474cd 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: fe2cef8cdfc3bbdd1aff4bf40700c445c2e5f8dd33e3199e95717c8faedaa498
-updated: 2020-02-07T16:46:11.373155-08:00
+hash: 3e5f125dc8eba7cd579904822cc559c6343e2e7011297debcff3ef42aa07b9f3
+updated: 2020-02-14T16:34:33.546987-08:00
 imports:
 - name: cloud.google.com/go
   version: 83a0b8742b4d7302c26d3b71bfdcbd9224f6b951
@@ -61,8 +61,6 @@ imports:
   version: c8c88dbee036db4e4808d1f2ec8c2e15e11c3f80
   subpackages:
   - query
-- name: github.com/gorilla/schema
-  version: 61751c9687439bf8cd824ad7eec0d21db1a1b804
 - name: github.com/hashicorp/hcl
   version: 914dc3f8dd7c463188c73fc47e9ced82a6e421ca
   subpackages:
@@ -145,7 +143,9 @@ imports:
 - name: github.com/spf13/viper
   version: 01d7d76eb0020ae2fd1275899065ddfdd9f6a528
 - name: github.com/stellar/go
-  version: 7e6a2fc068c82638b19f4ce4fdfb23ad28ec6709
+  version: 6fed6295e962ee8c3798de6c18eccd48f418a8fe
+  repo: git@github.com:nikhilsaraf/go.git
+  vcs: git
   subpackages:
   - amount
   - build
@@ -165,7 +165,6 @@ imports:
   - support/clock
   - support/config
   - support/errors
-  - support/http/httpdecode
   - support/log
   - support/render/hal
   - support/render/httpjson
diff --git a/glide.yaml b/glide.yaml
index 2f28bc941..82bc55c2a 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -9,7 +9,9 @@ import:
 - package: github.com/spf13/pflag
   version: v1.0.0
 - package: github.com/stellar/go
-  version: release-horizonclient-v2.1.0
+  repo: git@github.com:nikhilsaraf/go.git
+  vcs: git
+  version: horizonclient-v2.0.0/2_max_fee_stats
   subpackages:
   - build
   - clients/horizonclient
diff --git a/plugins/batchedExchange.go b/plugins/batchedExchange.go
index 66620ab6b..4e3dc1b93 100644
--- a/plugins/batchedExchange.go
+++ b/plugins/batchedExchange.go
@@ -341,15 +341,17 @@ func (b BatchedExchange) OpenOrders2Offers(orders []model.OpenOrder, baseAsset h
 			lmt = &lastModTime
 		}
 		offers = append(offers, hProtocol.Offer{
-			ID:                 ID,
-			Seller:             tradingAccount,
-			Selling:            sellingAsset,
-			Buying:             buyingAsset,
-			Amount:             amount,
-			PriceR:             price,
-			Price:              priceString,
-			LastModifiedLedger: 0, // TODO fix?
-			LastModifiedTime:   lmt,
+			ID: ID,
+			OfferBase: hProtocol.OfferBase{
+				Seller:             tradingAccount,
+				Selling:            sellingAsset,
+				Buying:             buyingAsset,
+				Amount:             amount,
+				PriceR:             price,
+				Price:              priceString,
+				LastModifiedLedger: 0, // TODO fix?
+				LastModifiedTime:   lmt,
+			},
 		})
 	}
 	return offers, nil
diff --git a/plugins/sdexExtensions.go b/plugins/sdexExtensions.go
index 0e136a6de..dde3a197f 100644
--- a/plugins/sdexExtensions.go
+++ b/plugins/sdexExtensions.go
@@ -85,7 +85,7 @@ func getFeeFromStats(horizonClient horizonclient.ClientInterface, capacityTrigge
 	return maxOpFeeStroops, nil
 }
 
-func getMaxFee(fs *hProtocol.FeeStats, percentile uint8) (int64, error) {
+func getMaxFee(fs *hProtocol.FeeStats, percentile uint8) (int, error) {
 	switch percentile {
 	case 10:
 		return fs.MaxFee.P10, nil