diff --git a/src/Time/TimeManager.cxx b/src/Time/TimeManager.cxx
index 1f6325cb0..1a4a7c0b8 100644
--- a/src/Time/TimeManager.cxx
+++ b/src/Time/TimeManager.cxx
@@ -141,7 +141,9 @@ void TimeManager::unbind()
     _frameRate.clear();
     _frameLatency.clear();
     _frameRateWorst.clear();
-    
+    _frameWait.clear();
+    _maxFrameRate.clear();
+
     _sceneryLoaded.clear();
     _modelHz.clear();
     _timeDelta.clear();
diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 670056663..97ce0200d 100644
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -206,6 +206,7 @@ void FGLight::unbind () {
     for (int i = 0; i < 4; ++i)
         _chromeProps[i] = SGPropertyNode_ptr();
     _sunAngleRad = SGPropertyNode_ptr();
+    _moonAngleRad.reset();
     _humidity = SGPropertyNode_ptr();
 }