diff --git a/include/tudat/astro/basic_astro/dateTime.h b/include/tudat/astro/basic_astro/dateTime.h
index 253259092..dec2c371f 100644
--- a/include/tudat/astro/basic_astro/dateTime.h
+++ b/include/tudat/astro/basic_astro/dateTime.h
@@ -266,7 +266,7 @@ DateTime addSecondsToDateTime( const DateTime& dateTime, const TimeType timeToAd
 template< typename TimeType >
 DateTime addDaysToDateTime( const DateTime& dateTime, const TimeType daysToAdd )
 {
-    return getCalendarDateFromTime< Time >( dateTime.epoch< Time >( ) + daysToAdd * mathematical_constants::getFloatingInteger< TimeType >( 86400 ) );
+    return getCalendarDateFromTime< Time >( dateTime.epoch< Time >( ) + daysToAdd * mathematical_constants::getFloatingInteger< long double >( 86400 ) );
 }
 
 
diff --git a/include/tudat/simulation/estimation_setup/fitOrbitToEphemeris.h b/include/tudat/simulation/estimation_setup/fitOrbitToEphemeris.h
index 729a5ba8e..37ea5ab5b 100644
--- a/include/tudat/simulation/estimation_setup/fitOrbitToEphemeris.h
+++ b/include/tudat/simulation/estimation_setup/fitOrbitToEphemeris.h
@@ -52,7 +52,7 @@ std::shared_ptr< observation_models::ObservationCollection< StateScalarType, Tim
     while( currentTime < finalTime )
     {
         observationTimes.push_back( currentTime );
-        currentTime += dataPointInterval;
+        currentTime += static_cast< double >( dataPointInterval );
     }
 
 
diff --git a/include/tudat/simulation/estimation_setup/processTrackingTxtFile.h b/include/tudat/simulation/estimation_setup/processTrackingTxtFile.h
index 4ed0440bb..bb0fe18f2 100644
--- a/include/tudat/simulation/estimation_setup/processTrackingTxtFile.h
+++ b/include/tudat/simulation/estimation_setup/processTrackingTxtFile.h
@@ -268,7 +268,7 @@ createTrackingTxtFileObservationCollection(
   std::map<ObservableType, std::map<LinkEnds, std::vector<Eigen::Matrix<ObservationScalarType, Eigen::Dynamic, 1> >>> observablesMap;
 
   // Get vectors of times, observations, and ancillary settings for the current observable type and link ends
-  std::vector<TimeType> allObservationTimes = processedTrackingTxtFileContents->getObservationTimes();
+  std::vector<TimeType> allObservationTimes = utilities::staticCastVector< TimeType, double >( processedTrackingTxtFileContents->getObservationTimes() );
   std::vector<LinkEnds> linkEndsVector = processedTrackingTxtFileContents->getLinkEndsVector();
   std::set<LinkEnds> linkEndsSet = processedTrackingTxtFileContents->getLinkEndsSet();