diff --git a/src/general.cpp b/src/general.cpp
index 9ad454ec..cd69e0d3 100644
--- a/src/general.cpp
+++ b/src/general.cpp
@@ -452,18 +452,18 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj)
 	obs_data_set_default_int(obj, "idleTabPos", 10);
 	obs_data_set_default_int(obj, "sequenceTabPos", 11);
 
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "generalTabPos"));
-	switcher->tabOrder.emplace_back(
-		obs_data_get_int(obj, "transitionTabPos"));
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "pauseTabPos"));
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "titleTabPos"));
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "exeTabPos"));
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "regionTabPos"));
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "mediaTabPos"));
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "fileTabPos"));
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "randomTabPos"));
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "timeTabPos"));
-	switcher->tabOrder.emplace_back(obs_data_get_int(obj, "idleTabPos"));
-	switcher->tabOrder.emplace_back(
-		obs_data_get_int(obj, "sequenceTabPos"));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "generalTabPos")));
+	switcher->tabOrder.emplace_back((int)(
+		obs_data_get_int(obj, "transitionTabPos")));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "pauseTabPos")));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "titleTabPos")));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "exeTabPos")));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "regionTabPos")));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "mediaTabPos")));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "fileTabPos")));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "randomTabPos")));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "timeTabPos")));
+	switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "idleTabPos")));
+	switcher->tabOrder.emplace_back((int)(
+		obs_data_get_int(obj, "sequenceTabPos")));
 }
diff --git a/src/headers/switcher-data-structs.hpp b/src/headers/switcher-data-structs.hpp
index e3bc1e1b..8f6e12f8 100644
--- a/src/headers/switcher-data-structs.hpp
+++ b/src/headers/switcher-data-structs.hpp
@@ -210,7 +210,7 @@ struct MediaSwitch {
 	OBSWeakSource source;
 	OBSWeakSource transition;
 	obs_media_state state;
-	uint64_t time;
+	int64_t time;
 	time_restriction restriction;
 	bool matched;
 	bool usePreviousScene;