diff --git a/cli/chain.go b/cli/chain.go
index a57a9a14a..22a788f3b 100644
--- a/cli/chain.go
+++ b/cli/chain.go
@@ -18,7 +18,7 @@ var chainHeadCmd = &cli.Command{
 	Name:  "head",
 	Usage: "Print chain head",
 	Action: func(cctx *cli.Context) error {
-		api, err := getApi(cctx)
+		api, err := getAPI(cctx)
 		if err != nil {
 			return err
 		}
diff --git a/cli/cmd.go b/cli/cmd.go
index b987862a9..e6eb40d4b 100644
--- a/cli/cmd.go
+++ b/cli/cmd.go
@@ -21,7 +21,7 @@ const (
 // ApiConnector returns API instance
 type ApiConnector func() api.API
 
-func getApi(ctx *cli.Context) (api.API, error) {
+func getAPI(ctx *cli.Context) (api.API, error) {
 	r, err := repo.NewFS(ctx.String("repo"))
 	if err != nil {
 		return nil, err
@@ -32,6 +32,9 @@ func getApi(ctx *cli.Context) (api.API, error) {
 		return nil, err
 	}
 	_, addr, err := manet.DialArgs(ma)
+	if err != nil {
+		return nil, err
+	}
 	return client.NewRPC("http://" + addr + "/rpc/v0"), nil
 }
 
diff --git a/cli/net.go b/cli/net.go
index 76044ec54..a46a48200 100644
--- a/cli/net.go
+++ b/cli/net.go
@@ -26,7 +26,7 @@ var netPeers = &cli.Command{
 	Name:  "peers",
 	Usage: "Print peers",
 	Action: func(cctx *cli.Context) error {
-		api, err := getApi(cctx)
+		api, err := getAPI(cctx)
 		if err != nil {
 			return err
 		}
@@ -48,7 +48,7 @@ var netListen = &cli.Command{
 	Name:  "listen",
 	Usage: "List listen addresses",
 	Action: func(cctx *cli.Context) error {
-		api, err := getApi(cctx)
+		api, err := getAPI(cctx)
 		if err != nil {
 			return err
 		}
@@ -70,7 +70,7 @@ var netConnect = &cli.Command{
 	Name:  "connect",
 	Usage: "Connect to a peer",
 	Action: func(cctx *cli.Context) error {
-		api, err := getApi(cctx)
+		api, err := getAPI(cctx)
 		if err != nil {
 			return err
 		}
diff --git a/node/repo/fsrepo.go b/node/repo/fsrepo.go
index 8c71150b7..a0d052371 100644
--- a/node/repo/fsrepo.go
+++ b/node/repo/fsrepo.go
@@ -62,7 +62,7 @@ func (fsr *FsRepo) Init() error {
 
 	log.Infof("Initializing repo at '%s'", fsr.path)
 
-	return os.Mkdir(fsr.path, 0755)
+	return os.Mkdir(fsr.path, 0755) // nolint
 }
 
 // APIEndpoint returns endpoint of API in this repo
@@ -214,7 +214,7 @@ func (fsr *fsLockedRepo) SetAPIEndpoint(ma multiaddr.Multiaddr) error {
 	if err := fsr.stillValid(); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(fsr.join(fsAPI), []byte(ma.String()), 0666)
+	return ioutil.WriteFile(fsr.join(fsAPI), []byte(ma.String()), 0644)
 }
 
 func (fsr *fsLockedRepo) Wallet() (interface{}, error) {