diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp
index e5f7198af..8e1f8b99b 100644
--- a/src/blackmisc/aviation/aircraftparts.cpp
+++ b/src/blackmisc/aviation/aircraftparts.cpp
@@ -77,6 +77,8 @@ namespace BlackMisc
         CAircraftParts CAircraftParts::guessedParts(const CAircraftSituation &situation, const CAircraftSituationChange &change, const CAircraftModel &model)
         {
             CAircraftParts parts;
+            parts.setMSecsSinceEpoch(situation.getMSecsSinceEpoch());
+            parts.setTimeOffsetMs(situation.getTimeOffsetMs());
             parts.setPartsDetails(GuessedParts);
             parts.setLights(CAircraftLights::guessedLights(situation));
 
diff --git a/src/blackmisc/aviation/aircraftsituationchange.cpp b/src/blackmisc/aviation/aircraftsituationchange.cpp
index 8b872e912..5db15d19d 100644
--- a/src/blackmisc/aviation/aircraftsituationchange.cpp
+++ b/src/blackmisc/aviation/aircraftsituationchange.cpp
@@ -103,7 +103,7 @@ namespace BlackMisc
                    QStringLiteral(" | accelerating.: ") % boolToYesNo(this->isConstAccelerating()) % QStringLiteral(" decelarating: ") % boolToYesNo(this->isConstDecelarating()) %
                    QStringLiteral(" | rotate up: ") % boolToYesNo(this->isRotatingUp()) %
                    QStringLiteral(" | push back: ") % boolToYesNo(this->containsPushBack()) %
-                   QStringLiteral(" | scenery delta: ") % m_guessedSceneryDeviation.valueRoundedWithUnit(1) % QStringLiteral(" [") % this->getGuessedSceneryDeviationAsString() %
+                   QStringLiteral(" | scenery delta: ") % m_guessedSceneryDeviation.valueRoundedWithUnit(1) % QStringLiteral(" [") % this->getSceneryDeviationHintAsString() %
                    QStringLiteral("] | AGL delta: ") % m_gndDistMean.valueRoundedWithUnit(1) % QStringLiteral("/") %  m_gndDistStdDev.valueRoundedWithUnit(1) %
                    QStringLiteral(" | std.dev/mean: pitch ") %  m_pitchMean.valueRoundedWithUnit(1) % QStringLiteral("/") %  m_pitchStdDev.valueRoundedWithUnit(1) %
                    QStringLiteral(" gs ") % m_gsMean.valueRoundedWithUnit(1) % QStringLiteral("/") % m_gsStdDev.valueRoundedWithUnit(1) %
diff --git a/src/blackmisc/aviation/aircraftsituationchange.h b/src/blackmisc/aviation/aircraftsituationchange.h
index 400579b7d..3df028acc 100644
--- a/src/blackmisc/aviation/aircraftsituationchange.h
+++ b/src/blackmisc/aviation/aircraftsituationchange.h
@@ -134,7 +134,7 @@ namespace BlackMisc
 
             //! Scnenery deviation (if it can be calculated, otherwise PhysicalQuantities::CLength::null)
             //! This is without CG, so substract CG to get deviation
-            const PhysicalQuantities::CLength &guessedSceneryDeviation() const { return m_guessedSceneryDeviation; }
+            const PhysicalQuantities::CLength &getGuessedSceneryDeviation() const { return m_guessedSceneryDeviation; }
 
             //! Get scenery deviation under consideration of CG
             PhysicalQuantities::CLength getGuessedSceneryDeviationCG() const { return m_guessedSceneryDeviationCG; }
@@ -143,7 +143,7 @@ namespace BlackMisc
             GuessedSceneryDeviation getSceneryDeviationHint() const { return static_cast<GuessedSceneryDeviation>(m_guessedSceneryDeviationHint); }
 
             //! Scenery deviation hint hint as string
-            const QString &getGuessedSceneryDeviationAsString() const { return guessedSceneryDeviationToString(this->getSceneryDeviationHint()); }
+            const QString &getSceneryDeviationHintAsString() const { return guessedSceneryDeviationToString(this->getSceneryDeviationHint()); }
 
             //! Scenery deviation available?
             bool hasSceneryDeviation() const;