diff --git a/consolegit2gitfilters.json b/consolegit2gitfilters.json
index 1d570f2497..639a9ec549 100644
--- a/consolegit2gitfilters.json
+++ b/consolegit2gitfilters.json
@@ -26,7 +26,12 @@
     "/doc/user-docs/",
     "/src/tools/ansi-color/",
     "/src/tools/ColorTool/",
+    "/src/tools/scratch/",
+    "/src/tools/ConsoleBench/",
+    "/src/tools/schemes-fragment/",
     "/scratch/",
+    "/tools/ReleaseEngineering/",
+    "/policies/",
     "Scratch.sln",
   ],
   "SuffixFilters": [
@@ -44,6 +49,11 @@
     ".rec",
     ".err",
     "XamlStyler.json",
-    ".xlsx"
+    ".xlsx",
+    ".vcxproj",
+    ".vcxproj.filters",
+    ".Build.props",
+    ".Build.targets",
+    "OpenConsole.slnx"
   ]
 }
diff --git a/src/cascadia/WindowsTerminal/IslandWindow.cpp b/src/cascadia/WindowsTerminal/IslandWindow.cpp
index 55d46abd68..e627bd4495 100644
--- a/src/cascadia/WindowsTerminal/IslandWindow.cpp
+++ b/src/cascadia/WindowsTerminal/IslandWindow.cpp
@@ -624,7 +624,7 @@ void IslandWindow::_OnGetMinMaxInfo(const WPARAM /*wParam*/, const LPARAM lParam
             const auto scale = GetCurrentDpiScale();
             const winrt::Windows::Foundation::Point real{ relative.x / scale, relative.y / scale };
 
-            winrt::Microsoft::Terminal::Core::Point wheelDelta{ 0, static_cast<int32_t>(HIWORD(wparam)) };
+            winrt::Microsoft::Terminal::Core::Point wheelDelta{ 0, std::bit_cast<int16_t>(HIWORD(wparam)) };
             if (message == WM_MOUSEHWHEEL)
             {
                 std::swap(wheelDelta.X, wheelDelta.Y);
diff --git a/src/dep/dirs b/src/dep/dirs
deleted file mode 100644
index 0a2b779226..0000000000
--- a/src/dep/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-DIRS=\
-     fmt \
diff --git a/src/host/sources.inc b/src/host/sources.inc
index 945ac81b10..431cdb447c 100644
--- a/src/host/sources.inc
+++ b/src/host/sources.inc
@@ -81,6 +81,7 @@ SOURCES = \
     ..\writeData.cpp \
     ..\renderData.cpp \
     ..\renderFontDefaults.cpp \
+    ..\AccessibilityNotifier.cpp \
     ..\ConsoleArguments.cpp \
 
 
diff --git a/src/interactivity/onecore/ConsoleControl.cpp b/src/interactivity/onecore/ConsoleControl.cpp
index 5de68271dc..5f1e131cea 100644
--- a/src/interactivity/onecore/ConsoleControl.cpp
+++ b/src/interactivity/onecore/ConsoleControl.cpp
@@ -12,6 +12,10 @@ using namespace Microsoft::Console::Interactivity::OneCore;
 
 #pragma region IConsoleControl Members
 
+void ConsoleControl::Control(ControlType /*command*/, PVOID /*ptr*/, DWORD /*len*/) noexcept
+{
+}
+
 void ConsoleControl::NotifyWinEvent(DWORD /*event*/, HWND /*hwnd*/, LONG /*idObject*/, LONG /*idChild*/) noexcept
 {
 }
diff --git a/src/interactivity/onecore/ConsoleControl.hpp b/src/interactivity/onecore/ConsoleControl.hpp
index 61e9f3b1f5..a7fb3d5162 100644
--- a/src/interactivity/onecore/ConsoleControl.hpp
+++ b/src/interactivity/onecore/ConsoleControl.hpp
@@ -24,6 +24,7 @@ namespace Microsoft::Console::Interactivity::OneCore
     {
     public:
         // IConsoleControl Members
+        void Control(ControlType command, PVOID ptr, DWORD len) noexcept override;
         void NotifyWinEvent(DWORD event, HWND hwnd, LONG idObject, LONG idChild) noexcept override;
         void NotifyConsoleApplication(_In_ DWORD dwProcessId) noexcept override;
         void SetForeground(_In_ HANDLE hProcess, _In_ BOOL fForeground) noexcept override;