diff --git a/gateway/core/corehttp/corehttp.go b/gateway/core/corehttp/corehttp.go
index 330e8e9c2..c52bea8f5 100644
--- a/gateway/core/corehttp/corehttp.go
+++ b/gateway/core/corehttp/corehttp.go
@@ -85,7 +85,7 @@ func Serve(node *core.IpfsNode, lis net.Listener, options ...ServeOption) error
 	}
 
 	select {
-	case <-node.Process().Closing():
+	case <-node.Process.Closing():
 		return fmt.Errorf("failed to start server, process closing")
 	default:
 	}
@@ -95,7 +95,7 @@ func Serve(node *core.IpfsNode, lis net.Listener, options ...ServeOption) error
 	}
 
 	var serverError error
-	serverProc := node.Process().Go(func(p goprocess.Process) {
+	serverProc := node.Process.Go(func(p goprocess.Process) {
 		serverError = server.Serve(lis)
 	})
 
@@ -103,7 +103,7 @@ func Serve(node *core.IpfsNode, lis net.Listener, options ...ServeOption) error
 	select {
 	case <-serverProc.Closed():
 	// if node being closed before server exits, close server
-	case <-node.Process().Closing():
+	case <-node.Process.Closing():
 		log.Infof("server at %s terminating...", addr)
 
 		warnProc := periodicproc.Tick(5*time.Second, func(_ goprocess.Process) {
diff --git a/gateway/core/corehttp/gateway_handler.go b/gateway/core/corehttp/gateway_handler.go
index cdbcce594..72566930b 100644
--- a/gateway/core/corehttp/gateway_handler.go
+++ b/gateway/core/corehttp/gateway_handler.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core"
 	"github.com/ipfs/go-ipfs/dagutils"
+	"github.com/ipfs/go-ipfs/namesys/resolve"
 
 	"github.com/dustin/go-humanize"
 	"github.com/ipfs/go-cid"
@@ -423,7 +424,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var newcid cid.Cid
-	rnode, err := core.Resolve(ctx, i.node.Namesys, i.node.Resolver, rootPath)
+	rnode, err := resolve.Resolve(ctx, i.node.Namesys, i.node.Resolver, rootPath)
 	switch ev := err.(type) {
 	case resolver.ErrNoLink:
 		// ev.Node < node where resolve failed