diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp
index 2e7bc1fd7..b4dbf4a0c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp
@@ -34,7 +34,7 @@ namespace LtsScriptTimeline
 
 QDataStream& operator<<(QDataStream& ds, const TrackEntry& te)
 {
-    const QByteArray jsonContent = QJsonDocument(te.m_detailData).toBinaryData();
+    const QByteArray jsonContent = QJsonDocument(te.m_detailData).toJson(QJsonDocument::Compact);
     ds << te.m_topicId << te.m_startTime << te.m_length << static_cast<quint8>(te.m_type) << te.isSet << te.index
        << jsonContent << te.x << te.y << te.h << te.w << te.m_channelName << te.m_description;
     return ds;
@@ -48,7 +48,7 @@ QDataStream& operator>>(QDataStream& ds, TrackEntry& te)
         te.y >> te.h >> te.w >> te.m_channelName >> te.m_description;
 
     te.m_type = static_cast<TrackEntryType>(type);
-    te.m_detailData = QJsonDocument::fromBinaryData(jsonContent).object();
+    te.m_detailData = QJsonDocument::fromJson(jsonContent).object();
     return ds;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp
index aa31325c2..4eef044e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp
@@ -3165,14 +3165,14 @@ BatteryAlarm BatteryAlarm::fromJson(const QJsonObject &obj)
 
 QJsonObject BatteryAlarm::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header().toJson()},
                       {QStringLiteral("id"), id},
                       {QStringLiteral("description"), description},
                       {QStringLiteral("acknowledge"), acknowledge},
                       {QStringLiteral("condition"), condition},
                       {QStringLiteral("uniqueAlarmNumber"), uniqueAlarmNumber},
                       {QStringLiteral("alarmTime"), alarmTime}
-                     });
+                     };
 }
 
 ServiceControl ServiceControl::fromJson(const QJsonObject &obj)