diff --git a/src/EnergyPlus/DataZoneEquipment.cc b/src/EnergyPlus/DataZoneEquipment.cc
index 922dcf928b9..00503b85837 100644
--- a/src/EnergyPlus/DataZoneEquipment.cc
+++ b/src/EnergyPlus/DataZoneEquipment.cc
@@ -402,18 +402,18 @@ void GetZoneEquipmentData(EnergyPlusData &state)
             for (int spaceNum : thisZone.spaceIndexes) {
                 ++spaceCount;
                 if (state.dataHeatBal->space(spaceNum).SystemZoneNodeNumber == 0) {
+                    std::string spaceNodeName = format("{}-Space {}", state.dataLoopNodes->NodeID(thisZone.SystemZoneNodeNumber), spaceCount);
+                    int spaceNodeNum = GetOnlySingleNode(state,
+                                                         spaceNodeName,
+                                                         state.dataZoneEquip->GetZoneEquipmentDataErrorsFound,
+                                                         DataLoopNode::ConnectionObjectType::ZoneHVACEquipmentConnections,
+                                                         AlphArray(1),
+                                                         DataLoopNode::NodeFluidType::Air,
+                                                         DataLoopNode::ConnectionType::ZoneNode,
+                                                         NodeInputManager::CompFluidStream::Primary,
+                                                         DataLoopNode::ObjectIsNotParent);
+                    state.dataHeatBal->space(spaceNum).SystemZoneNodeNumber = spaceNodeNum;
                 }
-                std::string spaceNodeName = format("{}-Space {}", AlphArray(5), spaceCount);
-                int spaceNodeNum = GetOnlySingleNode(state,
-                                                     spaceNodeName,
-                                                     state.dataZoneEquip->GetZoneEquipmentDataErrorsFound,
-                                                     DataLoopNode::ConnectionObjectType::ZoneHVACEquipmentConnections,
-                                                     AlphArray(1),
-                                                     DataLoopNode::NodeFluidType::Air,
-                                                     DataLoopNode::ConnectionType::ZoneNode,
-                                                     NodeInputManager::CompFluidStream::Primary,
-                                                     DataLoopNode::ObjectIsNotParent);
-                state.dataHeatBal->space(spaceNum).SystemZoneNodeNumber = spaceNodeNum;
             }
         }
     }
diff --git a/src/EnergyPlus/ZoneTempPredictorCorrector.cc b/src/EnergyPlus/ZoneTempPredictorCorrector.cc
index d60d1a744b5..51803ea04d0 100644
--- a/src/EnergyPlus/ZoneTempPredictorCorrector.cc
+++ b/src/EnergyPlus/ZoneTempPredictorCorrector.cc
@@ -4420,7 +4420,6 @@ Real64 ZoneSpaceHeatBalanceData::correctAirTemp(
         // SNLOAD is the single zone load, without Zone Multiplier or Zone List Multiplier
         SNLoad = ZoneEnthalpyIn - (thisSystemNode.MassFlowRate / ZoneMult) * CpAir * thisSystemNode.Temp + this->NonAirSystemResponse / ZoneMult +
                  this->SysDepZoneLoadsLagged;
-        Real64 dummy = SNLoad;
 
     } else {