diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp
index 6db136448e..b2cb1d3848 100644
--- a/UI/MenuScreens.cpp
+++ b/UI/MenuScreens.cpp
@@ -806,8 +806,8 @@ void AudioScreen::render() {
 		} 
 
 		// Show the download button even if not installed - might want to upgrade.
-		VLinear vlinear(30, 250, 20);
-		if (UIButton(GEN_ID, vlinear, 600, 0, a->T("Download Atrac3+ plugin"), ALIGN_LEFT)) {
+		VLinear vlinear(30, 400, 20);
+		if (UIButton(GEN_ID, vlinear, 400, 0, a->T("Download Atrac3+ plugin"), ALIGN_LEFT)) {
 			screenManager()->push(new PluginScreen());
 		}
 
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index b8d5f83a0a..edb16cd4eb 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -350,8 +350,8 @@ namespace MainWindow
 				TouchInput touch;
 				touch.id = 0;
 				touch.flags = TOUCH_DOWN;
-				touch.x = GET_X_LPARAM(lParam);
-				touch.y = GET_Y_LPARAM(lParam);
+				touch.x = input_state.pointer_x[0];
+				touch.y = input_state.pointer_y[0];
 				NativeTouch(touch);
 			}
 			break;
@@ -378,8 +378,8 @@ namespace MainWindow
 					TouchInput touch;
 					touch.id = 0;
 					touch.flags = TOUCH_MOVE;
-					touch.x = GET_X_LPARAM(lParam);
-					touch.y = GET_Y_LPARAM(lParam);
+					touch.x = input_state.pointer_x[0];
+					touch.y = input_state.pointer_y[0];
 					NativeTouch(touch);
 				}
 			}
@@ -398,8 +398,8 @@ namespace MainWindow
 				TouchInput touch;
 				touch.id = 0;
 				touch.flags = TOUCH_UP;
-				touch.x = GET_X_LPARAM(lParam);
-				touch.y = GET_Y_LPARAM(lParam);
+				touch.x = input_state.pointer_x[0];
+				touch.y = input_state.pointer_y[0];
 				NativeTouch(touch);
 			}
 			break;