diff --git a/pkg/component/delete/delete.go b/pkg/component/delete/delete.go
index 26f1fb51a..db0b95014 100644
--- a/pkg/component/delete/delete.go
+++ b/pkg/component/delete/delete.go
@@ -230,7 +230,7 @@ func (do *DeleteComponentClient) ExecutePreStopEvents(ctx context.Context, devfi
 	)
 	err = libdevfile.ExecPreStopEvents(ctx, devfileObj, handler)
 	if err != nil {
-		klog.V(4).Infof("Failed to execute %q event commands for component %q, cause: %v", libdevfile.PreStop, componentName, err.Error())
+		log.Warningf("Failed to execute %q event commands for component %q, cause: %v", libdevfile.PreStop, componentName, err.Error())
 	}
 
 	return nil
diff --git a/pkg/libdevfile/command.go b/pkg/libdevfile/command.go
index 56aa51df3..0e4c82319 100644
--- a/pkg/libdevfile/command.go
+++ b/pkg/libdevfile/command.go
@@ -33,8 +33,9 @@ func newCommand(devfileObj parser.DevfileObj, devfileCmd v1alpha2.Command) (comm
 	case v1alpha2.CompositeCommandType:
 		if util.SafeGetBool(devfileCmd.Composite.Parallel) {
 			cmd = newParallelCompositeCommand(devfileObj, devfileCmd)
+		} else {
+			cmd = newCompositeCommand(devfileObj, devfileCmd)
 		}
-		cmd = newCompositeCommand(devfileObj, devfileCmd)
 
 	case v1alpha2.ExecCommandType:
 		cmd = newExecCommand(devfileObj, devfileCmd)
diff --git a/pkg/libdevfile/command_composite_parallel.go b/pkg/libdevfile/command_composite_parallel.go
index 34eed10aa..83467b016 100644
--- a/pkg/libdevfile/command_composite_parallel.go
+++ b/pkg/libdevfile/command_composite_parallel.go
@@ -52,7 +52,7 @@ func (o *parallelCompositeCommand) Execute(ctx context.Context, handler Handler,
 	}
 	commandExecs := util.NewConcurrentTasks(len(o.command.Composite.Commands))
 	for _, devfileCmd := range o.command.Composite.Commands {
-		cmd, err2 := newCommand(o.devfileObj, allCommands[devfileCmd])
+		cmd, err2 := newCommand(o.devfileObj, allCommands[strings.ToLower(devfileCmd)])
 		if err2 != nil {
 			return err2
 		}