diff --git a/e2e/single-cluster/gitrepo_test.go b/e2e/single-cluster/gitrepo_test.go
index 25ad20a104..c1bc97ed05 100644
--- a/e2e/single-cluster/gitrepo_test.go
+++ b/e2e/single-cluster/gitrepo_test.go
@@ -170,7 +170,6 @@ var _ = Describe("Monitoring Git repos via HTTP for change", Label("infra-setup"
 			Expect(err).ToNot(HaveOccurred())
 		})
 
-
 		It("updates the deployment", func() {
 			By("checking the pod exists")
 			Eventually(func() string {
diff --git a/internal/bundlereader/loaddirectory_test.go b/internal/bundlereader/loaddirectory_test.go
index 35661fa1ea..1d3d7a0772 100644
--- a/internal/bundlereader/loaddirectory_test.go
+++ b/internal/bundlereader/loaddirectory_test.go
@@ -23,6 +23,7 @@ type fsNode struct {
 	isDir bool
 }
 
+// nolint: funlen
 func TestGetContent(t *testing.T) {
 	cases := []struct {
 		name               string
diff --git a/internal/cmd/agent/deployer/monitor.go b/internal/cmd/agent/deployer/monitor.go
index 2c0bc1c89b..80da288c88 100644
--- a/internal/cmd/agent/deployer/monitor.go
+++ b/internal/cmd/agent/deployer/monitor.go
@@ -233,7 +233,7 @@ func modified(plan apply.Plan, resourcesPreviousRelease *helmdeployer.Resources)
 	for gvk, keys := range plan.Create {
 		for _, key := range keys {
 			if len(result) >= 10 {
-				return
+				return result
 			}
 
 			apiVersion, kind := gvk.ToAPIVersionAndKind()
@@ -250,7 +250,7 @@ func modified(plan apply.Plan, resourcesPreviousRelease *helmdeployer.Resources)
 	for gvk, keys := range plan.Delete {
 		for _, key := range keys {
 			if len(result) >= 10 {
-				return
+				return result
 			}
 
 			apiVersion, kind := gvk.ToAPIVersionAndKind()
@@ -310,7 +310,7 @@ func nonReady(plan apply.Plan, ignoreOptions fleet.IgnoreOptions) (result []flee
 
 	for _, obj := range plan.Objects {
 		if len(result) >= 10 {
-			return
+			return result
 		}
 		if u, ok := obj.(*unstructured.Unstructured); ok {
 			if ignoreOptions.Conditions != nil {
diff --git a/internal/cmd/controller/target/target.go b/internal/cmd/controller/target/target.go
index 7dc0c90abd..4dca013ba9 100644
--- a/internal/cmd/controller/target/target.go
+++ b/internal/cmd/controller/target/target.go
@@ -327,7 +327,7 @@ func preprocessHelmValues(opts *fleet.BundleDeploymentOptions, cluster *fleet.Cl
 		}
 	}
 	if len(clusterLabels) == 0 {
-		return
+		return nil
 	}
 
 	if opts.Helm == nil {