diff --git a/src/blackmisc/avioadfsystem.h b/src/blackmisc/avioadfsystem.h
index b06f753c6..1e6dd8175 100644
--- a/src/blackmisc/avioadfsystem.h
+++ b/src/blackmisc/avioadfsystem.h
@@ -31,8 +31,8 @@ namespace BlackMisc
             CAdfSystem() : CModulator() {}
 
             //! Constructor
-            CAdfSystem(const QString &name, const PhysicalQuantities::CFrequency &activeFrequency, const PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet(), int digits = 3):
-                CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency, digits)
+            CAdfSystem(const QString &name, const PhysicalQuantities::CFrequency &activeFrequency, const PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet()):
+                CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency)
             { }
 
             //! Valid aviation frequency?
diff --git a/src/blackmisc/aviocomsystem.h b/src/blackmisc/aviocomsystem.h
index f9796438f..60d38bc3b 100644
--- a/src/blackmisc/aviocomsystem.h
+++ b/src/blackmisc/aviocomsystem.h
@@ -35,8 +35,8 @@ namespace BlackMisc
             CComSystem() : CModulator(), m_channelSpacing(ChannelSpacing25KHz) {}
 
             //! Constructor
-            CComSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet(), int digits = 3):
-                CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency, digits), m_channelSpacing(ChannelSpacing25KHz)
+            CComSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet()):
+                CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency), m_channelSpacing(ChannelSpacing25KHz)
             { }
 
             //! Set active frequency
diff --git a/src/blackmisc/aviomodulator.h b/src/blackmisc/aviomodulator.h
index e43d34f62..1b6585904 100644
--- a/src/blackmisc/aviomodulator.h
+++ b/src/blackmisc/aviomodulator.h
@@ -121,15 +121,13 @@ namespace BlackMisc
             static const QStringList &jsonMembers();
 
         protected:
-            int m_digits; //!< digits used
-
             //! Default constructor
             CModulator() :
-                CAvionicsBase("default"), m_volumeInput(0), m_volumeOutput(0), m_enabled(true), m_digits(2) {}
+                CAvionicsBase("default") {}
 
             //! Constructor
-            CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency, int digits) :
-                CAvionicsBase(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency), m_volumeInput(0), m_volumeOutput(0), m_enabled(true), m_digits(digits) {}
+            CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency) :
+                CAvionicsBase(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency) {}
 
             //! \copydoc CValueObject::convertToQString
             virtual QString convertToQString(bool i18n = false) const override
@@ -251,9 +249,9 @@ namespace BlackMisc
             BLACK_ENABLE_TUPLE_CONVERSION(CModulator)
             BlackMisc::PhysicalQuantities::CFrequency m_frequencyActive;  //!< active frequency
             BlackMisc::PhysicalQuantities::CFrequency m_frequencyStandby; //!< standby frequency
-            qint32 m_volumeInput;  //!< volume input
-            qint32 m_volumeOutput; //!< volume output
-            bool m_enabled; //!< is enabled, used e.g. for mute etc.
+            qint32 m_volumeInput = 0;  //!< volume input
+            qint32 m_volumeOutput = 0; //!< volume output
+            bool m_enabled = true;     //!< is enabled, used e.g. for mute etc.
 
             //! Easy access to derived class (CRTP template parameter)
             AVIO const *derived() const { return static_cast<AVIO const *>(this); }
diff --git a/src/blackmisc/avionavsystem.h b/src/blackmisc/avionavsystem.h
index c47d86029..cea2b2cba 100644
--- a/src/blackmisc/avionavsystem.h
+++ b/src/blackmisc/avionavsystem.h
@@ -26,8 +26,8 @@ namespace BlackMisc
             CNavSystem() : CModulator() {}
 
             //! Constructor
-            CNavSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency, int digits = 3):
-                CModulator(name, activeFrequency, standbyFrequency, digits)
+            CNavSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency):
+                CModulator(name, activeFrequency, standbyFrequency)
             { }
 
             //! Set active frequency