diff --git a/cmd/crowdsec/api.go b/cmd/crowdsec/api.go
index 12eff952f77..6ab41def16f 100644
--- a/cmd/crowdsec/api.go
+++ b/cmd/crowdsec/api.go
@@ -59,11 +59,14 @@ func initAPIServer(ctx context.Context, cConfig *csconfig.Config) (*apiserver.AP
 
 func serveAPIServer(apiServer *apiserver.APIServer) {
 	apiReady := make(chan bool, 1)
+
 	apiTomb.Go(func() error {
 		defer trace.CatchPanic("crowdsec/serveAPIServer")
+
 		go func() {
 			defer trace.CatchPanic("crowdsec/runAPIServer")
 			log.Debugf("serving API after %s ms", time.Since(crowdsecT0))
+
 			if err := apiServer.Run(apiReady); err != nil {
 				log.Fatal(err)
 			}
@@ -77,6 +80,7 @@ func serveAPIServer(apiServer *apiserver.APIServer) {
 		<-apiTomb.Dying() // lock until go routine is dying
 		pluginTomb.Kill(nil)
 		log.Infof("serve: shutting down api server")
+
 		return apiServer.Shutdown()
 	})
 	<-apiReady
@@ -88,5 +92,6 @@ func hasPlugins(profiles []*csconfig.ProfileCfg) bool {
 			return true
 		}
 	}
+
 	return false
 }
diff --git a/cmd/crowdsec/serve.go b/cmd/crowdsec/serve.go
index 5c8a830668a..14602c425fe 100644
--- a/cmd/crowdsec/serve.go
+++ b/cmd/crowdsec/serve.go
@@ -90,7 +90,7 @@ func reloadHandler(sig os.Signal) (*csconfig.Config, error) {
 			return nil, err
 		}
 
-		if err := hub.Load(); err != nil {
+		if err = hub.Load(); err != nil {
 			return nil, err
 		}
 
@@ -392,7 +392,7 @@ func Serve(cConfig *csconfig.Config, agentReady chan bool) error {
 			return err
 		}
 
-		if err := hub.Load(); err != nil {
+		if err = hub.Load(); err != nil {
 			return err
 		}
 
diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go
index 0b3690a6c43..b04ad687e4e 100644
--- a/pkg/apiserver/apiserver_test.go
+++ b/pkg/apiserver/apiserver_test.go
@@ -3,7 +3,6 @@ package apiserver
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -41,7 +40,7 @@ var (
 		MachineID: &testMachineID,
 		Password:  &testPassword,
 	}
-	UserAgent = fmt.Sprintf("crowdsec-test/%s", version.Version)
+	UserAgent = "crowdsec-test/" + version.Version
 	emptyBody = strings.NewReader("")
 )
 
@@ -373,7 +372,7 @@ func TestLoggingDebugToFileConfig(t *testing.T) {
 		LogDir:    tempDir,
 		DbConfig:  &dbconfig,
 	}
-	expectedFile := fmt.Sprintf("%s/crowdsec_api.log", tempDir)
+	expectedFile := filepath.Join(tempDir, "crowdsec_api.log")
 	expectedLines := []string{"/test42"}
 	cfg.LogLevel = ptr.Of(log.DebugLevel)
 
@@ -426,7 +425,7 @@ func TestLoggingErrorToFileConfig(t *testing.T) {
 		LogDir:    tempDir,
 		DbConfig:  &dbconfig,
 	}
-	expectedFile := fmt.Sprintf("%s/crowdsec_api.log", tempDir)
+	expectedFile := filepath.Join(tempDir, "crowdsec_api.log")
 	cfg.LogLevel = ptr.Of(log.ErrorLevel)
 
 	// Configure logging