diff --git a/src/runtime/virtcontainers/clh.go b/src/runtime/virtcontainers/clh.go
index 11c1f7e35..22a8bec02 100644
--- a/src/runtime/virtcontainers/clh.go
+++ b/src/runtime/virtcontainers/clh.go
@@ -657,7 +657,7 @@ func (clh *cloudHypervisor) HotplugRemoveDevice(ctx context.Context, devInfo int
 	defer span.End()
 
 	if clh.config.ConfidentialGuest {
-		return nil, errors.New("Device hotplug addition is not supported in confidential mode")
+		return nil, errors.New("Device hotplug removal is not supported in confidential mode")
 	}
 
 	var deviceID string
diff --git a/tools/packaging/static-build/cloud-hypervisor/build-static-clh.sh b/tools/packaging/static-build/cloud-hypervisor/build-static-clh.sh
index 1f49abcaa..cf2aaec38 100755
--- a/tools/packaging/static-build/cloud-hypervisor/build-static-clh.sh
+++ b/tools/packaging/static-build/cloud-hypervisor/build-static-clh.sh
@@ -16,7 +16,7 @@ ARCH=$(uname -m)
 script_dir=$(dirname $(readlink -f "$0"))
 kata_version="${kata_version:-}"
 force_build_from_source="${force_build_from_source:-false}"
-extra_build_args="${extra_build_args:-}"
+features="${features:-}"
 
 source "${script_dir}/../../scripts/lib.sh"
 
@@ -68,7 +68,7 @@ if [ "${ARCH}" == "aarch64" ]; then
     force_build_from_source="true"
 fi
 
-if [ -n "${extra_build_args}" ]; then
+if [ -n "${features}" ]; then
     info "As an extra build argument has been passed to the script, forcing to build from source"
     force_build_from_source="true"
 fi