diff --git a/common/serial/typed_message.go b/common/serial/typed_message.go
index 14b31b011..45fdcc6a8 100644
--- a/common/serial/typed_message.go
+++ b/common/serial/typed_message.go
@@ -2,6 +2,7 @@ package serial
 
 import (
 	"errors"
+
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
diff --git a/main/commands/base/execute.go b/main/commands/base/execute.go
index 802f01c27..aa454606f 100644
--- a/main/commands/base/execute.go
+++ b/main/commands/base/execute.go
@@ -28,7 +28,8 @@ func Execute() {
 
 BigCmdLoop:
 	for bigCmd := RootCommand; ; {
-		for _, cmd := range bigCmd.Commands {
+		for _, oCmd := range bigCmd.Commands {
+			cmd := oCmd
 			if cmd.Name() != args[0] {
 				continue
 			}