diff --git a/rpcserver.go b/rpcserver.go
index b9d79689..843be343 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -82,12 +82,16 @@ var rpcHandlersBeforeInit = map[string]commandHandler{
 	"debuglevel":           handleDebugLevel,
 	"decoderawtransaction": handleDecodeRawTransaction,
 	"decodescript":         handleDecodeScript,
+	"estimatefee":          handleUnimplemented,
+	"estimatepriority":     handleUnimplemented,
 	"getaddednodeinfo":     handleGetAddedNodeInfo,
 	"getbestblock":         handleGetBestBlock,
 	"getbestblockhash":     handleGetBestBlockHash,
 	"getblock":             handleGetBlock,
+	"getblockchaininfo":    handleUnimplemented,
 	"getblockcount":        handleGetBlockCount,
 	"getblockhash":         handleGetBlockHash,
+	"getblocktemplate":     handleUnimplemented,
 	"getconnectioncount":   handleGetConnectionCount,
 	"getcurrentnet":        handleGetCurrentNet,
 	"getdifficulty":        handleGetDifficulty,
@@ -97,6 +101,7 @@ var rpcHandlersBeforeInit = map[string]commandHandler{
 	"getmininginfo":        handleGetMiningInfo,
 	"getnettotals":         handleGetNetTotals,
 	"getnetworkhashps":     handleGetNetworkHashPS,
+	"getnetworkinfo":       handleUnimplemented,
 	"getpeerinfo":          handleGetPeerInfo,
 	"getrawmempool":        handleGetRawMempool,
 	"getrawtransaction":    handleGetRawTransaction,
@@ -129,7 +134,6 @@ var rpcAskWallet = map[string]bool{
 	"getaccountaddress":      true,
 	"getaddressesbyaccount":  true,
 	"getbalance":             true,
-	"getblocktemplate":       true,
 	"getnewaddress":          true,
 	"getrawchangeaddress":    true,
 	"getreceivedbyaccount":   true,
@@ -137,6 +141,8 @@ var rpcAskWallet = map[string]bool{
 	"gettransaction":         true,
 	"gettxout":               true,
 	"gettxoutsetinfo":        true,
+	"getunconfirmedbalance":  true,
+	"getwalletinfo":          true,
 	"importprivkey":          true,
 	"importwallet":           true,
 	"keypoolrefill":          true,