diff --git a/RGB.NET.Core/Decorators/AbstractDecorateable.cs b/RGB.NET.Core/Decorators/AbstractDecorateable.cs
index 8acfc54..50602ae 100644
--- a/RGB.NET.Core/Decorators/AbstractDecorateable.cs
+++ b/RGB.NET.Core/Decorators/AbstractDecorateable.cs
@@ -14,13 +14,18 @@ namespace RGB.NET.Core
         private readonly List<T> _decorators = new();
 
         /// <inheritdoc />
-        public IReadOnlyCollection<T> Decorators
+        public IReadOnlyCollection<T> Decorators { get; }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AbstractDecoratable{T}"/> class.
+        /// </summary>
+        protected AbstractDecoratable()
         {
-            get
-            {
-                lock (_decorators)
-                    return new ReadOnlyCollection<T>(_decorators);
-            }
+            Decorators = new ReadOnlyCollection<T>(_decorators);
         }
 
         #endregion
diff --git a/RGB.NET.Devices.DMX/E131/E131DeviceInfo.cs b/RGB.NET.Devices.DMX/E131/E131DeviceInfo.cs
index a7606af..d7f46be 100644
--- a/RGB.NET.Devices.DMX/E131/E131DeviceInfo.cs
+++ b/RGB.NET.Devices.DMX/E131/E131DeviceInfo.cs
@@ -68,7 +68,7 @@ namespace RGB.NET.Devices.DMX.E131
             this.Hostname = deviceDefinition.Hostname;
             this.Port = deviceDefinition.Port;
             this.Universe = deviceDefinition.Universe;
-            
+
             byte[]? cid = deviceDefinition.CID;
             if ((cid == null) || (cid.Length != CID_LENGTH))
             {
@@ -76,7 +76,7 @@ namespace RGB.NET.Devices.DMX.E131
                 new Random().NextBytes(cid);
             }
 
-            CID = cid!;
+            CID = cid;
 
             DeviceName = DeviceHelper.CreateDeviceName(Manufacturer, Model);
         }