diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp
index d8da68a495..defa08b8df 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp
@@ -1,9 +1,7 @@
 #include "stdafx.h"
 #include "overlay_home_menu.h"
 #include "Emu/RSX/RSXThread.h"
-
-#include <sstream>
-#include <iomanip>
+#include "Utilities/date_time.h"
 
 namespace rsx
 {
@@ -11,11 +9,7 @@ namespace rsx
 	{
 		std::string get_time_string()
 		{
-			std::ostringstream ost;
-			const std::time_t dateTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
- 			const std::tm tm = *std::localtime(&dateTime);
-			ost << std::put_time(&tm, "%Y/%m/%d %H:%M:%S");
-			return ost.str();
+			return date_time::fmt_time("%Y/%m/%d %H:%M:%S", time(nullptr));
 		}
 
 		home_menu_dialog::home_menu_dialog()
diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp
index 9b917716f1..5ca92aac12 100644
--- a/rpcs3/main.cpp
+++ b/rpcs3/main.cpp
@@ -3,8 +3,6 @@
 
 #include <iostream>
 #include <chrono>
-#include <sstream>
-#include <iomanip>
 
 #include <QApplication>
 #include <QCommandLineParser>
@@ -28,6 +26,7 @@
 
 #include "headless_application.h"
 #include "Utilities/sema.h"
+#include "Utilities/date_time.h"
 #include "Crypto/decrypt_binaries.h"
 #ifdef _WIN32
 #include "module_verifier.hpp"
@@ -410,11 +409,8 @@ void log_q_debug(QtMsgType type, const QMessageLogContext& context, const QStrin
 template <>
 void fmt_class_string<std::chrono::sys_time<typename std::chrono::system_clock::duration>>::format(std::string& out, u64 arg)
 {
-	std::ostringstream ss;
 	const std::time_t dateTime = std::chrono::system_clock::to_time_t(get_object(arg));
- 	const std::tm tm = *std::localtime(&dateTime);
-	ss << std::put_time(&tm, "%Y-%m-%eT%H:%M:%S");
- 	out += ss.str();
+ 	out += date_time::fmt_time("%Y-%m-%eT%H:%M:%S", dateTime);
 }
 
 void run_platform_sanity_checks()
diff --git a/rpcs3/util/media_utils.cpp b/rpcs3/util/media_utils.cpp
index 88e92dd0a7..db002f6a0d 100644
--- a/rpcs3/util/media_utils.cpp
+++ b/rpcs3/util/media_utils.cpp
@@ -442,7 +442,7 @@ namespace utils
 							memcpy(&data[m_size], buffer, buffer_size);
 						}
 
-						const u32 timestamp_ms = stream->time_base.den ? (1000 * av.frame->best_effort_timestamp * stream->time_base.num) / stream->time_base.den : 0;
+						const s64 timestamp_ms = stream->time_base.den ? (1000 * av.frame->best_effort_timestamp * stream->time_base.num) / stream->time_base.den : 0;
 						timestamps_ms.push_back({m_size, timestamp_ms});
 						m_size += buffer_size;
 					}