diff --git a/src/xenia/hid/xinput/xinput_input_driver.cc b/src/xenia/hid/xinput/xinput_input_driver.cc
index c8e203e9b..1ec31ced7 100644
--- a/src/xenia/hid/xinput/xinput_input_driver.cc
+++ b/src/xenia/hid/xinput/xinput_input_driver.cc
@@ -26,10 +26,18 @@ namespace xinput {
 
 XInputInputDriver::XInputInputDriver(xe::ui::Window* window)
     : InputDriver(window) {
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8 && _WIN32_WINNT < _WIN32_WINNT_WIN10)
+  // TODO(gibbed): Is this necessary?
   XInputEnable(TRUE);
+#endif
 }
 
-XInputInputDriver::~XInputInputDriver() { XInputEnable(FALSE); }
+XInputInputDriver::~XInputInputDriver() {
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8 && _WIN32_WINNT < _WIN32_WINNT_WIN10)
+  // TODO(gibbed): Is this necessary?
+  XInputEnable(FALSE);
+#endif
+}
 
 #pragma warning(pop)
 
diff --git a/src/xenia/ui/file_picker_win.cc b/src/xenia/ui/file_picker_win.cc
index 9014b60cb..f97c828cd 100644
--- a/src/xenia/ui/file_picker_win.cc
+++ b/src/xenia/ui/file_picker_win.cc
@@ -36,11 +36,9 @@ class CDialogEventHandler : public IFileDialogEvents,
   IFACEMETHODIMP QueryInterface(REFIID riid, void** ppv) {
     static const QITAB qit[] = {
         {&__uuidof(IFileDialogEvents),
-         static_cast<int>(
-             OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler))},
+         OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler)},
         {&__uuidof(IFileDialogControlEvents),
-         static_cast<int>(
-             OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler))},
+         OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler)},
         {0},
     };
     return QISearch(this, qit, riid, ppv);