diff --git a/pkg/commands/run_test.go b/pkg/commands/run_test.go
index fe228a41f..f65c0e9e3 100644
--- a/pkg/commands/run_test.go
+++ b/pkg/commands/run_test.go
@@ -58,7 +58,7 @@ func Test_addDefaultHOME(t *testing.T) {
 			user: "www-add",
 			mockUser: &user.User{
 				Username: "www-add",
-				HomeDir: "some-other",
+				HomeDir:  "some-other",
 			},
 			initial: []string{
 				"PATH=/something/else",
@@ -113,8 +113,8 @@ func Test_addDefaultHOME(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			userLookup = func(username string) ( *user.User,  error) { return test.mockUser, nil}
-			defer func() {userLookup = user.Lookup}()
+			userLookup = func(username string) (*user.User, error) { return test.mockUser, nil }
+			defer func() { userLookup = user.Lookup }()
 			actual := addDefaultHOME(test.user, test.initial)
 			testutil.CheckErrorAndDeepEqual(t, false, nil, test.expected, actual)
 		})
diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go
index ab327c860..00562e56f 100644
--- a/pkg/util/fs_util.go
+++ b/pkg/util/fs_util.go
@@ -84,7 +84,7 @@ func GetFSFromImage(root string, img v1.Image) ([]string, error) {
 
 	for i, l := range layers {
 		if mediaType, err := l.MediaType(); err == nil {
-			logrus.Tracef("Extracting layer %d of media type %s", mediaType)
+			logrus.Tracef("Extracting layer %d of media type %s", i, mediaType)
 		} else {
 			logrus.Tracef("Extracting layer %d", i)
 		}