diff -ruN mvtools_sf1/mvtools_sf/meson.build mvtools_sf2/mvtools_sf/meson.build
--- mvtools_sf1/mvtools_sf/meson.build	2026-01-09 10:14:54.078102796 +0100
+++ mvtools_sf2/mvtools_sf/meson.build	2026-01-09 09:47:30.731036516 +0100
@@ -15,9 +15,12 @@
 vsfs = dependency('vsfilterscript')
 fftw = dependency('fftw3')

+vsfs_inc = include_directories('vsFilterScript')
+
 src = ['src/EntryPoint.cxx']

 shared_module('mvtools_sf', src,
+    include_directories : vsfs_inc,
     dependencies : [vs, vsfs, fftw],
     gnu_symbol_visibility : 'hidden',
     install_dir : join_paths(vs.get_pkgconfig_variable('libdir'), 'vapoursynth'),
diff -ruN mvtools_sf1/mvtools_sf/vsFilterScript/Function.vxx mvtools_sf2/mvtools_sf/vsFilterScript/Function.vxx
--- mvtools_sf1/mvtools_sf/vsFilterScript/Function.vxx	2026-01-09 09:25:32.631653927 +0100
+++ mvtools_sf2/mvtools_sf/vsFilterScript/Function.vxx	2026-01-09 09:26:25.356469407 +0100
@@ -46,7 +46,7 @@
 			VaporGlobals::API->freeMap(EvaluatedMap);
 		VaporGlobals::API->freeFunc(FunctionHandle);
 	}
-	auto ExtractEvaluatedResult();
+	auto ExtractEvaluatedResult() -> decltype(EvaluatedMap);
 	auto operator()(auto&& ...Arguments) {
 		auto ArgumentMap = VaporGlobals::API->createMap();
 		RefreshEvaluatedMap();
@@ -58,4 +58,4 @@
 			throw RuntimeError{ EvaluationState };
 		return ExtractEvaluatedResult();
 	}
-};
\ No newline at end of file
+};
diff -ruN mvtools_sf1/mvtools_sf/vsFilterScript/Infrastructure.vxx mvtools_sf2/mvtools_sf/vsFilterScript/Infrastructure.vxx
--- mvtools_sf1/mvtools_sf/vsFilterScript/Infrastructure.vxx	2026-01-09 09:25:37.593532924 +0100
+++ mvtools_sf2/mvtools_sf/vsFilterScript/Infrastructure.vxx	2026-01-09 09:24:55.473145169 +0100
@@ -74,14 +74,25 @@
 	return const_cast<const UnderlyingType*>(Pointer);
 }

-auto Max(auto x, auto y) {
-	return x > y ? x : y;
+template<typename A, typename B>
+constexpr auto Max(A x, B y)
+{
+    using R = std::common_type_t<A, B>;
+    return static_cast<R>(x) > static_cast<R>(y)
+         ? static_cast<R>(x)
+         : static_cast<R>(y);
 }

-auto Min(auto x, auto y) {
-	return x < y ? x : y;
+template<typename A, typename B>
+constexpr auto Min(A x, B y)
+{
+    using R = std::common_type_t<A, B>;
+    return static_cast<R>(x) < static_cast<R>(y)
+         ? static_cast<R>(x)
+         : static_cast<R>(y);
 }

+
 auto ExposeCString(auto&& String) {
 	if constexpr (isinstance(String, const char*) || isinstance(String, char*))
 		return String;
@@ -97,4 +108,4 @@
 		return true;
 	else
 		return false;
-}
\ No newline at end of file
+}
diff -ruN mvtools_sf1/mvtools_sf/vsFilterScript/Map.vxx mvtools_sf2/mvtools_sf/vsFilterScript/Map.vxx
--- mvtools_sf1/mvtools_sf/vsFilterScript/Map.vxx	2026-01-09 10:02:12.570716905 +0100
+++ mvtools_sf2/mvtools_sf/vsFilterScript/Map.vxx	2026-01-09 09:56:31.699689099 +0100
@@ -184,8 +184,8 @@
 		VaporGlobals::API->setError(EvaluatedMap, EvaluationState);
 }

-auto Function::ExtractEvaluatedResult() {
-	return ReadonlyItem{ .Map = EvaluatedMap, .Key = "val" };
+auto Function::ExtractEvaluatedResult() -> decltype(EvaluatedMap) {
+    return EvaluatedMap;
 }

 template<auto ContainsMultipleClips, auto NumberOfClips>
@@ -217,4 +217,4 @@
 		MaterializedParameter = Argument;
 	if constexpr (sizeof...(ArgumentQueue) != 0)
 		ForwardArguments(ArgumentMap, Forward(ArgumentQueue)...);
-}
\ No newline at end of file
+}