diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo
index 32318d1fee5..578c81e778b 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Conveyor.mo
@@ -65,7 +65,7 @@ model IMC_Conveyor
     annotation (Placement(transformation(extent={{-20,-34},{0,-14}})));
   parameter Utilities.ParameterRecords.IM_SquirrelCageData aimcData "Induction machine data"
     annotation (Placement(transformation(extent={{-20,-80},{0,-60}})));
-  Blocks.Math.Gain gain(k=fNominal/unitFrequency)
+  Blocks.Math.Gain gain(k=fNominal)
     annotation (Placement(transformation(extent={{-70,50},{-50,70}})));
   Mechanics.Translational.Components.IdealGearR2T idealGearR2T(ratio=1/r)
     annotation (Placement(transformation(extent={{12,-50},{32,-30}})));
diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo
index b8028193674..fa0e3142b4e 100644
--- a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo
+++ b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo
@@ -71,7 +71,7 @@ model SMPM_Braking
         origin={-10,30})));
   Analog.Basic.VariableResistor variableResistor
     annotation (Placement(transformation(extent={{0,50},{-20,70}})));
-  Blocks.Math.Gain          gain(k=unitK*R/wNominal)
+  Blocks.Math.Gain          gain(k=R/wNominal)
                                  annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo
index d6874f7101c..c35808a815a 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo
@@ -7,18 +7,18 @@ model GenericHystTellinenPermanentMagnet
 
   parameter SI.MagneticFluxDensity Br=1.2 "Remanence" annotation (Dialog(group="Hysteresis", groupImage="modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard/HardMagneticHysteresis.png"));
   parameter SI.MagneticFieldStrength Hc=5e5 "Coercitivity" annotation (Dialog(group="Hysteresis"));
-  parameter Real M(final unit="1") = unitH*10/Hc
+  parameter Real M(final unit="m/A") = 10/Hc
     "Slope of tanh()-function" annotation (Dialog(group="Hysteresis"));
   parameter Real K(final unit="1")=1 "mu_0 multiplier" annotation (Dialog(group="Hysteresis"));
 
 protected
   constant SI.MagneticFieldStrength unitH = 1;
   parameter SI.MagneticFluxDensity eps= Br/1000;
-  parameter SI.MagneticFieldStrength H0= 0.5*log((1+mu0*Hc/Br)/(1-mu0*Hc/Br)) + M*Hc;
+  parameter Real H0(final unit="1")= 0.5*log((1+mu0*Hc/Br)/(1-mu0*Hc/Br)) + M*Hc;
 
 equation
-  hystR = Br*tanh((M*H - H0)/unitH) + mu0*H - eps/2;
-  hystF = Br*tanh((M*H + H0)/unitH) + mu0*H + eps/2;
+  hystR = Br*tanh((M*H - H0)) + mu0*H - eps/2;
+  hystF = Br*tanh((M*H + H0)) + mu0*H + eps/2;
 
   annotation (defaultComponentName="pm",
               Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,
diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
index a1aa795985a..442bd9ed368 100644
--- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
+++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
@@ -68,7 +68,7 @@ model IMC_Conveyor
     Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData
     aimcData "Induction machine data"
     annotation (Placement(transformation(extent={{70,72},{90,92}})));
-  Modelica.Blocks.Math.Gain gain(k=fNominal/unitFrequency)
+  Modelica.Blocks.Math.Gain gain(k=fNominal)
     annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
   Modelica.Mechanics.Translational.Components.IdealGearR2T idealGearR2T(ratio=1/r)
     annotation (Placement(transformation(extent={{32,10},{12,30}})));
diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Braking.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Braking.mo
index 8f7e9159384..895ff1e907e 100644
--- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Braking.mo
+++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Braking.mo
@@ -76,7 +76,7 @@ model SMPM_Braking
         origin={-10,30})));
   Modelica.Electrical.Analog.Basic.VariableResistor variableResistor
     annotation (Placement(transformation(extent={{0,50},{-20,70}})));
-  Modelica.Blocks.Math.Gain gain(k=unitK*R/wNominal) annotation (Placement(
+  Modelica.Blocks.Math.Gain gain(k=R/wNominal) annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
index dec33d7be90..1a6915ca67f 100644
--- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
+++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Conveyor.mo
@@ -61,7 +61,7 @@ model IMC_Conveyor "Induction machine with squirrel cage and inverter driving a
     Modelica.Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData
     imcData "Induction machine data"
     annotation (Placement(transformation(extent={{70,72},{90,92}})));
-  Modelica.Blocks.Math.Gain gainQS(k=fNominal/unitFrequency)
+  Modelica.Blocks.Math.Gain gainQS(k=fNominal)
     annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
   Modelica.Mechanics.Translational.Components.IdealGearR2T idealGearR2TQS(ratio=1/r)
     annotation (Placement(transformation(extent={{32,10},{12,30}})));
@@ -125,7 +125,7 @@ model IMC_Conveyor "Induction machine with squirrel cage and inverter driving a
       terminalConnection="Y", m=m)
     annotation (Placement(transformation(extent={{60,-74},{40,-54}})));
   Modelica.Blocks.Math.Gain
-                   gain(k=fNominal/unitFrequency)
+                   gain(k=fNominal)
     annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
   Modelica.Mechanics.Translational.Components.IdealGearR2T
                                                   idealGearR2T(ratio=1/r)