diff --git a/rw_core/core/device/agent_image.go b/rw_core/core/device/agent_image.go
index 94a8706..74a60c7 100644
--- a/rw_core/core/device/agent_image.go
+++ b/rw_core/core/device/agent_image.go
@@ -545,7 +545,7 @@
 	subCtx, cancel := context.WithTimeout(log.WithSpanFromContext(context.Background(), ctx), agent.defaultTimeout)
 	defer cancel()
 	subCtx = coreutils.WithRPCMetadataFromContext(subCtx, ctx)
-	logger.Debugw(ctx, "get-onu-images", log.Fields{"device-id": agent.deviceID})
+	logger.Debug(ctx, "get-onu-images")
 
 	// Send the request to the adapter
 	ch, err := agent.adapterProxy.GetOnuImages(subCtx, cloned, id)
diff --git a/rw_core/core/device/remote/adapter_proxy.go b/rw_core/core/device/remote/adapter_proxy.go
index 1a187f8..71dedb3 100755
--- a/rw_core/core/device/remote/adapter_proxy.go
+++ b/rw_core/core/device/remote/adapter_proxy.go
@@ -590,14 +590,14 @@
 }
 
 func (ap *AdapterProxy) GetOnuImages(ctx context.Context, device *voltha.Device, id *common.ID) (chan *kafka.RpcResponse, error) {
-	logger.Debugw(ctx, "get-onu-images", log.Fields{"device-id": device.Id})
+	logger.Debug(ctx, "get-onu-images")
 	rpc := "Get_onu_images"
 	toTopic, err := ap.getAdapterTopic(ctx, device.Id, device.Adapter)
 	if err != nil {
 		return nil, err
 	}
 	args := []*kafka.KVArg{
-		{Key: "deviceId", Value: id},
+		{Key: "deviceId", Value: &ic.StrType{Val: id.Id}},
 	}
 	replyToTopic := ap.getCoreTopic()
 	return ap.sendRPC(ctx, rpc, toTopic, &replyToTopic, true, device.Id, args...)