diff --git a/common/utils/StringUtils.cpp b/common/utils/StringUtils.cpp
index 9068743bf..749ad7967 100644
--- a/common/utils/StringUtils.cpp
+++ b/common/utils/StringUtils.cpp
@@ -488,18 +488,22 @@ void CapitalizeLabel(string *s) {
 void CustomCapitalizeLabel(string *s) {
   // Remember to update the Doxygen in include/ola/StringUtils.h too
   static const char* const transforms[] = {
+    "asc",
     "dhcp",
     "dmx",
     "dns",
     "ip",
     "ipv4",  // Should really be IPv4 probably, but better than nothing
     "ipv6",  // Should really be IPv6 probably, but better than nothing
+    "json",
     "led",
     "mdmx",  // City Theatrical, should really be mDMX, but better than nothing
+    "nsc",
     "pdl",
     "pid",
     "rdm",
     "uid",
+    "url",
     NULL
   };
   const size_t size = s->size();
diff --git a/include/ola/StringUtils.h b/include/ola/StringUtils.h
index c1bd47ca0..0f7675d39 100644
--- a/include/ola/StringUtils.h
+++ b/include/ola/StringUtils.h
@@ -490,16 +490,20 @@ void CapitalizeLabel(std::string *s);
  *
  * @param s a string to transform.
  * The following are capitalized:
+ *   - asc
  *   - dhcp
  *   - dmx
  *   - dns
  *   - ip
  *   - ipv4
  *   - ipv6
+ *   - json
  *   - led
  *   - mdmx
+ *   - nsc
  *   - rdm
  *   - uid
+ *   - url
  */
 void CustomCapitalizeLabel(std::string *s);
 
diff --git a/plugins/osc/README.developer.md b/plugins/osc/README.developer.md
index 0960bc8f6..714a4b26a 100644
--- a/plugins/osc/README.developer.md
+++ b/plugins/osc/README.developer.md
@@ -18,9 +18,10 @@ Before we begin you should do the following:
 * Have an understanding of the map & vector classes from the STL
   (http://www.sgi.com/tech/stl/ or http://www.cplusplus.com/reference/stl/).
 * Know something about the
-  [OSC specification](http://opensoundcontrol.org/spec-1_0). You don't need
-  to know the wire format for the OSC messages. but you should at least
-  recognize OSC addresses and know the different data types in a message.
+  [OSC specification](https://opensoundcontrol.stanford.edu/spec-1_0.html).
+  You don't need to know the wire format for the OSC messages. but you
+  should at least recognize OSC addresses and know the different data types
+  in a message.
 * Look at the [liblo site](http://liblo.sourceforge.net/) and read the
   examples.
 * Get familiar with the
diff --git a/plugins/osc/README.md b/plugins/osc/README.md
index 6a16251da..656edd4fc 100644
--- a/plugins/osc/README.md
+++ b/plugins/osc/README.md
@@ -2,7 +2,7 @@ OSC (Open Sound Control) Plugin
 ===============================
 
 This plugin allows OLA to send and receive
-[OSC](http://www.opensoundcontrol.org/) messages.
+[OSC](https://opensoundcontrol.stanford.edu/) messages.
 
 OLA uses the blob type for transporting DMX data.
 
diff --git a/tools/rdm/TestDefinitions.py b/tools/rdm/TestDefinitions.py
index 68069ea35..fd8240ffd 100644
--- a/tools/rdm/TestDefinitions.py
+++ b/tools/rdm/TestDefinitions.py
@@ -7225,9 +7225,11 @@ def VerifyResult(self, response, fields):
       return
 
     interfaces = []
+    count_by_interface = {}
 
     for interface in fields['interfaces']:
       interface_id = interface['interface_identifier']
+      count_by_interface[interface_id] = count_by_interface.get(interface_id, 0) + 1
       if (interface_id < RDM_INTERFACE_INDEX_MIN or
           interface_id > RDM_INTERFACE_INDEX_MAX):
         self.AddWarning('Interface index %d is outside allowed range (%d to '
@@ -7242,6 +7244,12 @@ def VerifyResult(self, response, fields):
                          'interface %d' %
                          (interface['interface_hardware_type'], interface_id))
 
+    # Check for duplicate interfaces
+    for interface, count in count_by_interface.items():
+      if count > 1:
+        self.AddAdvisory('Interface %s listed %d times in list interfaces' %
+                         (interface, count))
+
     self.SetProperty(self.PROVIDES[0], interfaces)