diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
index 5a8a62032..bccc6d8e7 100644
--- a/cmd/ipfs/daemon.go
+++ b/cmd/ipfs/daemon.go
@@ -432,7 +432,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error
 	var opts = []corehttp.ServeOption{
 		corehttp.MetricsCollectionOption("api"),
 		corehttp.CheckVersionOption(),
-		corehttp.CommandsOption(cctx),
+		corehttp.CommandsOption(*cctx),
 		corehttp.WebUIOption,
 		gatewayOpt,
 		corehttp.VersionOption(),
@@ -527,7 +527,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e
 	var opts = []corehttp.ServeOption{
 		corehttp.MetricsCollectionOption("gateway"),
 		corehttp.CheckVersionOption(),
-		corehttp.CommandsROOption(cctx),
+		corehttp.CommandsROOption(*cctx),
 		corehttp.VersionOption(),
 		corehttp.IPNSHostnameOption(),
 		corehttp.GatewayOption(writable, "/ipfs", "/ipns"),
diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go
index 492686293..6a8dda1b0 100644
--- a/cmd/ipfswatch/main.go
+++ b/cmd/ipfswatch/main.go
@@ -186,8 +186,8 @@ func IsHidden(path string) bool {
 	return false
 }
 
-func cmdCtx(node *core.IpfsNode, repoPath string) *commands.Context {
-	return &commands.Context{
+func cmdCtx(node *core.IpfsNode, repoPath string) commands.Context {
+	return commands.Context{
 		Online:     true,
 		ConfigRoot: repoPath,
 		LoadConfig: func(path string) (*config.Config, error) {
diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go
index 9c4dcd176..09b6cdf66 100644
--- a/core/corehttp/commands.go
+++ b/core/corehttp/commands.go
@@ -110,7 +110,7 @@ func patchCORSVars(c *cmdsHttp.ServerConfig, addr net.Addr) {
 	c.SetAllowedOrigins(origins...)
 }
 
-func commandsOption(cctx *oldcmds.Context, command *cmds.Command) ServeOption {
+func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption {
 	return func(n *core.IpfsNode, l net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
 
 		cfg := cmdsHttp.NewServerConfig()
@@ -132,11 +132,11 @@ func commandsOption(cctx *oldcmds.Context, command *cmds.Command) ServeOption {
 	}
 }
 
-func CommandsOption(cctx *oldcmds.Context) ServeOption {
+func CommandsOption(cctx oldcmds.Context) ServeOption {
 	return commandsOption(cctx, corecommands.Root)
 }
 
-func CommandsROOption(cctx *oldcmds.Context) ServeOption {
+func CommandsROOption(cctx oldcmds.Context) ServeOption {
 	return commandsOption(cctx, corecommands.RootRO)
 }