diff --git a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs
index 92eff397..c008e969 100644
--- a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs
+++ b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs
@@ -227,7 +227,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
                 SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
 
-                for (int i = 0; i < joinMap.NumberOfPresets.JoinSpan; i++)
+                for (int i = 0; i < joinMap.PresetRecallStart.JoinSpan; i++)
                 {
                     int tempNum = i;
 
diff --git a/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs b/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs
index a40daac5..078dc9e7 100644
--- a/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs
+++ b/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs
@@ -18,9 +18,13 @@ namespace PepperDash.Essentials.Devices.Common.DSP
 
         public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
 
-	    public DspBase(string key, string name) :
-	        base(key, name)
-	    {
+		public DspBase(string key, string name) :
+				base(key, name)
+		{
+
+			LevelControlPoints = new Dictionary<string, IBasicVolumeWithFeedback>();
+			DialerControlPoints = new Dictionary<string, DspControlPoint>();
+			SwitcherControlPoints = new Dictionary<string, DspControlPoint>();
 	    }