diff --git a/src/cloud-api-adaptor/test/provisioner/ibmcloud/provision_initializer.go b/src/cloud-api-adaptor/test/provisioner/ibmcloud/provision_initializer.go
index f67ef8021..b241498eb 100644
--- a/src/cloud-api-adaptor/test/provisioner/ibmcloud/provision_initializer.go
+++ b/src/cloud-api-adaptor/test/provisioner/ibmcloud/provision_initializer.go
@@ -132,8 +132,6 @@ func InitIBMCloudProperties(properties map[string]string) error {
 		IBMCloudProps.IsSelfManaged = true
 	}
 
-	log.Debugf("%+v", IBMCloudProps)
-
 	if len(IBMCloudProps.ResourceGroupID) <= 0 {
 		log.Info("[warning] RESOURCE_GROUP_ID was not set.")
 	}
diff --git a/src/cloud-api-adaptor/test/provisioner/ibmcloud/provision_kustomize.go b/src/cloud-api-adaptor/test/provisioner/ibmcloud/provision_kustomize.go
index 126a76a36..bab8710f1 100644
--- a/src/cloud-api-adaptor/test/provisioner/ibmcloud/provision_kustomize.go
+++ b/src/cloud-api-adaptor/test/provisioner/ibmcloud/provision_kustomize.go
@@ -133,7 +133,6 @@ func (lio *IBMCloudInstallOverlay) Delete(ctx context.Context, cfg *envconf.Conf
 
 // Update install/overlays/ibmcloud/kustomization.yaml
 func (lio *IBMCloudInstallOverlay) Edit(ctx context.Context, cfg *envconf.Config, properties map[string]string) error {
-	log.Debugf("%+v", properties)
 	var err error
 
 	// image
diff --git a/src/cloud-api-adaptor/test/securecomms/test/kbs.go b/src/cloud-api-adaptor/test/securecomms/test/kbs.go
index 3ec6d700b..1a8f2b328 100644
--- a/src/cloud-api-adaptor/test/securecomms/test/kbs.go
+++ b/src/cloud-api-adaptor/test/securecomms/test/kbs.go
@@ -3,6 +3,7 @@ package test
 import (
 	"context"
 	"fmt"
+	"html"
 	"io"
 	"log"
 	"net"
@@ -29,7 +30,7 @@ func (p kbsport) getRoot(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "Not Found", http.StatusNotFound)
 			return
 		}
-		_, err := w.Write(keyMaterial)
+		_, err := w.Write([]byte(html.EscapeString(string(keyMaterial))))
 		if err != nil {
 			http.Error(w, "cant write response", http.StatusInternalServerError)
 			return
diff --git a/src/cloud-providers/libvirt/libvirt.go b/src/cloud-providers/libvirt/libvirt.go
index a68fae40d..e7b223125 100644
--- a/src/cloud-providers/libvirt/libvirt.go
+++ b/src/cloud-providers/libvirt/libvirt.go
@@ -647,7 +647,7 @@ func CreateDomain(ctx context.Context, libvirtClient *libvirtClient, v *vmConfig
 func DeleteDomain(ctx context.Context, libvirtClient *libvirtClient, id string) (err error) {
 
 	logger.Printf("Deleting instance (%s)", id)
-	idUint, _ := strconv.ParseUint(id, 10, 64)
+	idUint, _ := strconv.ParseUint(id, 10, 32)
 	// libvirt API takes uint32
 	exists, err := checkDomainExistsById(uint32(idUint), libvirtClient)
 	if err != nil {