diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java
index 4a80fb3e60953..ce68b7d380435 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java
@@ -55,7 +55,6 @@ public Set<ThingTypeUID> getSupportedThingTypeUIDs() {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public DiscoveryResult createResult(ServiceInfo info) {
         DiscoveryResult result = null;
         ThingUID uid = getThingUID(info);
@@ -66,7 +65,7 @@ public DiscoveryResult createResult(ServiceInfo info) {
             Map<String, Object> properties = new HashMap<>(2);
 
             String label = null;
-            if (BST_10_THING_TYPE_UID.equals(uid.getThingTypeUID())) {
+            if (BST_10_THING_TYPE_UID.equals(getThingTypeUID(info))) {
                 try {
                     String group = DiscoveryUtil.executeUrl("http://" + addrs[0].getHostAddress() + ":8090/getGroup");
                     label = DiscoveryUtil.getContentOfFirstElement(group, "name");
diff --git a/bundles/org.openhab.binding.vitotronic/src/main/java/org/openhab/binding/vitotronic/internal/discovery/VitotronicDiscoveryService.java b/bundles/org.openhab.binding.vitotronic/src/main/java/org/openhab/binding/vitotronic/internal/discovery/VitotronicDiscoveryService.java
index 5243a5d141215..0d3acc8a5a953 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/java/org/openhab/binding/vitotronic/internal/discovery/VitotronicDiscoveryService.java
+++ b/bundles/org.openhab.binding.vitotronic/src/main/java/org/openhab/binding/vitotronic/internal/discovery/VitotronicDiscoveryService.java
@@ -68,8 +68,7 @@ private void addThing(ThingUID bridgeUID, String thingType, String thingID) {
         }
 
         if (thingUID != null) {
-            logger.trace("Adding new Discovery thingType: {} bridgeType: {}", thingUID.getThingTypeUID().getId(),
-                    bridgeUID.getThingTypeUID().getId());
+            logger.trace("Adding new Discovery thingType: {} bridgeType: {}", thingUID, bridgeUID);
             DiscoveryResult discoveryResult = DiscoveryResultBuilder.create(thingUID).withBridge(bridgeUID)
                     .withLabel(thingID).build();
             logger.trace("call register: {} label: {}", discoveryResult.getBindingId(), discoveryResult.getLabel());