diff --git a/Natives/LauncherPreferences.m b/Natives/LauncherPreferences.m
index c505e91c..b6c66c4a 100644
--- a/Natives/LauncherPreferences.m
+++ b/Natives/LauncherPreferences.m
@@ -148,7 +148,7 @@ void loadPreferences(BOOL reset) {
     // Debug settings
     setDefaultValueForPref(debugPrefDict, @"debug_skip_wait_jit", @NO);
     setDefaultValueForPref(debugPrefDict, @"debug_hide_home_indicator", @NO);
-    setDefaultValueForPref(debugPrefDict, @"debug_ipad_ui", @(UIDevice.currentDevice.userInterfaceIdiom != UIUserInterfaceIdiomTV));
+    setDefaultValueForPref(debugPrefDict, @"debug_ipad_ui", @(realUIIdiom != UIUserInterfaceIdiomTV));
     setDefaultValueForPref(debugPrefDict, @"debug_auto_correction", @YES);
     setDefaultValueForPref(debugPrefDict, @"debug_show_layout_bounds", @NO);
     setDefaultValueForPref(debugPrefDict, @"debug_show_layout_overlap", @NO);
@@ -157,7 +157,7 @@ void loadPreferences(BOOL reset) {
     setPreference(@"java_home", [getPreference(@"java_home") lastPathComponent]);
 
     // Special handling for debug_ipados_ui workaround
-    if (UIDevice.currentDevice.userInterfaceIdiom != UIUserInterfaceIdiomTV &&
+    if (realUIIdiom != UIUserInterfaceIdiomTV &&
         ![debugPrefDict[@"internal_workaround_ipad_ui_set"] boolValue]) {
         debugPrefDict[@"internal_workaround_ipad_ui_set"] = @YES;
         setPreference(@"debug_ipad_ui", @YES);
diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m
index 00e03704..f37b1141 100644
--- a/Natives/SurfaceViewController.m
+++ b/Natives/SurfaceViewController.m
@@ -588,7 +588,9 @@ BOOL slideableHotbar;
     };
 
     mouse.mouseInput.scroll.xAxis.valueChangedHandler = ^(GCControllerAxisInput * _Nonnull axis, float value) {
-        CallbackBridge_nativeSendScroll(value, 0);
+        // FIXME: some users having x scroll issue instead of y
+        //CallbackBridge_nativeSendScroll(value, 0);
+        CallbackBridge_nativeSendScroll(0, value);
     };
     mouse.mouseInput.scroll.yAxis.valueChangedHandler = ^(GCControllerAxisInput * _Nonnull axis, float value) {
         CallbackBridge_nativeSendScroll(0, -value);