diff --git a/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Case900.mo b/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Case900.mo
index 7e27de27a9..ffa18a27a2 100644
--- a/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Case900.mo
+++ b/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Case900.mo
@@ -4,10 +4,10 @@ model Case900
     zon5R1C(hInt=2.74,
       redeclare replaceable IBPSA.ThermalZones.ISO13790.Validation.BESTEST.Data.Case900Mass buiMas),
     annComBESTEST(
-      EHeaMax=7347600000,
-      EHeaMin=4212000000,
-      ECooMax=-11394000000,
-      ECooMin=-7686000000,
+      EHeaMax=  7.3476E+09,
+      EHeaMin=  4.2120E+09,
+      ECooMax=-11.3940E+09,
+      ECooMin= -7.6860E+09,
       PHeaMax=3797,
       PHeaMin=2850,
       PCooMax=-3871,
@@ -41,6 +41,11 @@ for heating and <i>27</i>&deg;C for cooling. The room has no shade and a window
 </p>
 </html>", revisions="<html><ul>
 <li>
+May 8, 2024, by Michael Wetter:<br/>
+Changed number format to avoid a warning in Optimica about number to be too large
+to be represented as an Integer.
+</li>
+<li>
 Mar 16, 2022, by Alessandro Maccarini:<br/>
 First implementation.
 </li>
diff --git a/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Data/Case600Results.mo b/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Data/Case600Results.mo
index 69afc2ed0f..e69709b432 100644
--- a/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Data/Case600Results.mo
+++ b/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Data/Case600Results.mo
@@ -1,10 +1,10 @@
 within IBPSA.ThermalZones.ISO13790.Validation.BESTEST.Data;
 record Case600Results "BESTEST comparison results"
   extends Modelica.Icons.Record;
-  parameter Modelica.Units.SI.Energy EHeaMax=20552400000 "Maximum annual heating load";
-  parameter Modelica.Units.SI.Energy EHeaMin=15465600000 "Minimum annaul heating load";
-  parameter Modelica.Units.SI.Energy ECooMax=-26200800000 "Maximum annual cooling load";
-  parameter Modelica.Units.SI.Energy ECooMin=-22093200000 "Minimum annual cooling load";
+  parameter Modelica.Units.SI.Energy EHeaMax= 20.5524E+09 "Maximum annual heating load";
+  parameter Modelica.Units.SI.Energy EHeaMin= 15.4656E+09 "Minimum annaul heating load";
+  parameter Modelica.Units.SI.Energy ECooMax=-26.2008E+09 "Maximum annual cooling load";
+  parameter Modelica.Units.SI.Energy ECooMin=-22.0932E+09 "Minimum annual cooling load";
   parameter Modelica.Units.SI.Power PHeaMax=4354 "Maximum peak heating load";
   parameter Modelica.Units.SI.Power PHeaMin=3437 "Minimum peak heating load";
   parameter Modelica.Units.SI.Power PCooMax=-6827 "Maximum peak cooling load";
@@ -16,5 +16,15 @@ record Case600Results "BESTEST comparison results"
 <p>
 BESTEST results for annual heating and cooling loads.
 </p>
+</html>",
+revisions="
+<html>
+<ul>
+<li>
+May 8, 2024, by Michael Wetter:<br/>
+Changed number format to avoid a warning in Optimica about number to be too large
+to be represented as an Integer.
+</li>
+</ul>
 </html>"));
 end Case600Results;
diff --git a/IBPSA/ThermalZones/ISO13790/Zone5R1C/Zone.mo b/IBPSA/ThermalZones/ISO13790/Zone5R1C/Zone.mo
index e27b56c9a8..83b16732d0 100644
--- a/IBPSA/ThermalZones/ISO13790/Zone5R1C/Zone.mo
+++ b/IBPSA/ThermalZones/ISO13790/Zone5R1C/Zone.mo
@@ -183,8 +183,6 @@ equation
       horizontalAlignment=TextAlignment.Right));
   connect(heaPorSur, HThe.port_a)
     annotation (Line(points={{40,0},{40,30}}, color={191,0,0}));
-  connect(heaPorSur, heaPorSur)
-    annotation (Line(points={{40,0},{40,0}}, color={191,0,0}));
   connect(win.weaBus, weaBus) annotation (Line(
       points={{-100,-50},{-112,-50},{-112,120},{120,120}},
       color={255,204,51},
@@ -383,6 +381,10 @@ If a wall contains only opaque parts, the corresponding window area must be set
 revisions="<html>
 <ul>
 <li>
+May 8, 2024, by Michael Wetter:<br/>
+Removed connection to itself.
+</li>
+<li>
 Mar 16, 2022, by Alessandro Maccarini:<br/>
 First implementation.
 </li>
