diff --git a/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs b/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
index 464073bd19..77d9a1beec 100644
--- a/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
+++ b/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
@@ -304,7 +304,9 @@ namespace BizHawk.Client.Common
 			int fileSuffix = 0;
 			while (File.Exists(newFileName))
 			{
-				newFileName = $"{Path.GetDirectoryName(oldFileName)}/{Path.GetFileNameWithoutExtension(oldFileName)} {++fileSuffix}.{TasMovie.Extension}";
+				// Using this should hopefully be system agnostic
+				var temp_path = Path.Combine(Path.GetDirectoryName(oldFileName), Path.GetFileNameWithoutExtension(oldFileName));
+				newFileName = $"{temp_path} {++fileSuffix}.{TasMovie.Extension}";
 			}
 
 			return newFileName;
diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
index 545ce2eca4..8b94aad69c 100644
--- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores;
 
@@ -48,8 +49,7 @@ namespace BizHawk.Client.Common
 			set
 			{
 				_filename = value;
-				int index = Filename.LastIndexOf("\\");
-				Name = Filename.Substring(index + 1, Filename.Length - index - 1);
+				Name = Path.GetFileName(Filename);
 			}
 		}