diff --git a/ear-production-suite-plugins/plugins/direct_speakers/src/value_box_main.hpp b/ear-production-suite-plugins/plugins/direct_speakers/src/value_box_main.hpp
index 661656fa..514cc2bb 100644
--- a/ear-production-suite-plugins/plugins/direct_speakers/src/value_box_main.hpp
+++ b/ear-production-suite-plugins/plugins/direct_speakers/src/value_box_main.hpp
@@ -60,8 +60,8 @@ class ValueBoxMain : public Component {
     auto pfDatas = tdData->relatedPackFormats;
     std::stable_sort(
         pfDatas.begin(), pfDatas.end(),
-        [](const std::shared_ptr<AdmPresetDefinitionsHelper::PackFormatData>& a,
-           const std::shared_ptr<AdmPresetDefinitionsHelper::PackFormatData>& b) {
+        [](const std::shared_ptr<AdmPresetDefinitionsHelper::PackFormatData const>& a,
+           const std::shared_ptr<AdmPresetDefinitionsHelper::PackFormatData const>& b) {
           if (a->isCommonDefinition() != b->isCommonDefinition()) {
             return a->isCommonDefinition() > b->isCommonDefinition();
           }
diff --git a/shared/helper/adm_preset_definitions_helper.cpp b/shared/helper/adm_preset_definitions_helper.cpp
index 9793e62f..bb7bf650 100644
--- a/shared/helper/adm_preset_definitions_helper.cpp
+++ b/shared/helper/adm_preset_definitions_helper.cpp
@@ -450,7 +450,7 @@ const bool AdmPresetDefinitionsHelper::ChannelFormatData::isCommonDefinition() c
 	return AdmPresetDefinitionsHelper::isCommonDefinition(idValue);
 }
 
-const std::string AdmPresetDefinitionsHelper::ChannelFormatData::getBestSpeakerLabel()
+const std::string AdmPresetDefinitionsHelper::ChannelFormatData::getBestSpeakerLabel() const
 {
 	if (legacySpeakerLabel.has_value())
 		return legacySpeakerLabel.value();
diff --git a/shared/helper/adm_preset_definitions_helper.h b/shared/helper/adm_preset_definitions_helper.h
index a29552b6..b28b9e05 100644
--- a/shared/helper/adm_preset_definitions_helper.h
+++ b/shared/helper/adm_preset_definitions_helper.h
@@ -34,7 +34,7 @@ class AdmPresetDefinitionsHelper {
 		float distance{ 1.f	};
 
 		const bool isCommonDefinition() const;
-		const std::string getBestSpeakerLabel();
+		const std::string getBestSpeakerLabel() const;
 
 	private:
 		void setItuLabels();
@@ -59,7 +59,7 @@ class AdmPresetDefinitionsHelper {
 		std::optional<std::string> ituLabel;
 		std::optional<std::string> ituStandard;
 		std::shared_ptr<adm::AudioPackFormat> packFormat;
-		std::vector<std::shared_ptr<ChannelFormatData>> relatedChannelFormats;
+		std::vector<std::shared_ptr<ChannelFormatData const>> relatedChannelFormats;
 
 		const bool isCommonDefinition() const;
 
@@ -71,7 +71,7 @@ class AdmPresetDefinitionsHelper {
 		int id{ 0 };
 		adm::TypeDescriptor typeDescriptor;
 		std::string name;
-		std::vector<std::shared_ptr<PackFormatData>> relatedPackFormats;
+		std::vector<std::shared_ptr<PackFormatData const>> relatedPackFormats;
 	};
 
 	struct ChannelTrackAssociation {