diff --git a/src/ripple/protocol/Feature.h b/src/ripple/protocol/Feature.h
index a4f07bc32..b000e9c91 100644
--- a/src/ripple/protocol/Feature.h
+++ b/src/ripple/protocol/Feature.h
@@ -74,7 +74,7 @@ namespace detail {
 // Feature.cpp. Because it's only used to reserve storage, and determine how
 // large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than
 // the actual number of amendments. A LogicError on startup will verify this.
-static constexpr std::size_t numFeatures = 52;
+static constexpr std::size_t numFeatures = 53;
 
 /** Amendments that this server supports and the default voting behavior.
    Whether they are enabled depends on the Rules defined in the validated
diff --git a/src/ripple/rpc/handlers/AccountNamespace.cpp b/src/ripple/rpc/handlers/AccountNamespace.cpp
index e661d9e32..30212b360 100644
--- a/src/ripple/rpc/handlers/AccountNamespace.cpp
+++ b/src/ripple/rpc/handlers/AccountNamespace.cpp
@@ -126,7 +126,7 @@ doAccountNamespace(RPC::JsonContext& context)
         result[jss::account_objects] = Json::arrayValue;
     }
 
-    result[jss::account] = context.app.accountIDCache().toBase58(accountID);
+    result[jss::account] = toBase58(accountID);
     result[jss::namespace_id] = ns;
     context.loadType = Resource::feeMediumBurdenRPC;
     return result;
diff --git a/src/ripple/rpc/handlers/Fee1.cpp b/src/ripple/rpc/handlers/Fee1.cpp
index 8ee45ec05..d635f6883 100644
--- a/src/ripple/rpc/handlers/Fee1.cpp
+++ b/src/ripple/rpc/handlers/Fee1.cpp
@@ -21,6 +21,7 @@
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/TxQ.h>
 #include <ripple/basics/mulDiv.h>
+#include <ripple/basics/StringUtilities.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/rpc/Context.h>
@@ -28,7 +29,6 @@
 #include <ripple/app/hook/applyHook.h>
 #include <ripple/app/tx/impl/Transactor.h>
 #include <ripple/basics/FeeUnits.h>
-
 namespace ripple {