diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs
index 29fa42bc9d..9a6a73badd 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs
@@ -141,8 +141,10 @@ namespace BizHawk.Client.Common
 
 			RecordingBatch = false;
 
-			if (!batch.Where(a => a.GetType() != typeof(MovieActionMarker)).Any())
+			if (batch.All(a => a.GetType() == typeof(MovieActionMarker)))
+			{
 				return Movie.InputLogLength;
+			}
 
 			return PreviousUndoFrame;
 		}
@@ -163,8 +165,10 @@ namespace BizHawk.Client.Common
 
 			RecordingBatch = false;
 
-			if (!batch.Where(a => a.GetType() != typeof(MovieActionMarker)).Any())
+			if (batch.All(a => a.GetType() == typeof(MovieActionMarker)))
+			{
 				return Movie.InputLogLength;
+			}
 
 			return PreviousRedoFrame;
 		}
diff --git a/BizHawk.Client.Common/tools/Watch/Watch.cs b/BizHawk.Client.Common/tools/Watch/Watch.cs
index 9475419cb9..1d1ae46cbf 100644
--- a/BizHawk.Client.Common/tools/Watch/Watch.cs
+++ b/BizHawk.Client.Common/tools/Watch/Watch.cs
@@ -545,7 +545,7 @@ namespace BizHawk.Client.Common
 		/// <returns></returns>
 		public bool IsDiplayTypeAvailable(DisplayType type)
 		{
-			return AvailableTypes().Where<DisplayType>(d => d == type).Any<DisplayType>();
+			return AvailableTypes().Any(d => d == type);
 		}
 
 		/// <summary>