diff --git a/Makefile b/Makefile
index dd25a63c..09ce3d31 100644
--- a/Makefile
+++ b/Makefile
@@ -141,8 +141,8 @@ endif
 ifeq ($(ARCH), win)
 	mkdir -p dist/Rack
 	cp -R LICENSE* res dist/Rack/
-	cp Rack.exe dist/Rack/
-	strip dist/Rack/Rack.exe
+	cp $(TARGET) dist/Rack/
+	strip dist/Rack/$(TARGET)
 	cp /mingw64/bin/libwinpthread-1.dll dist/Rack/
 	cp /mingw64/bin/zlib1.dll dist/Rack/
 	cp /mingw64/bin/libstdc++-6.dll dist/Rack/
@@ -168,7 +168,8 @@ endif
 ifeq ($(ARCH), lin)
 	mkdir -p dist/Rack
 	cp -R LICENSE* res dist/Rack/
-	cp Rack Rack.sh dist/Rack/
+	cp $(TARGET) Rack.sh dist/Rack/
+	strip dist/Rack/$(TARGET)
 	cp dep/lib/libspeexdsp.so dist/Rack/
 	cp dep/lib/libjansson.so.4 dist/Rack/
 	cp dep/lib/libGLEW.so.2.1 dist/Rack/
diff --git a/src/window.cpp b/src/window.cpp
index 06bc2493..99c9929a 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -94,6 +94,7 @@ void mouseButtonCallback(GLFWwindow *window, int button, int action, int mods) {
 				}
 			}
 		}
+		gTempWidget = NULL;
 	}
 	else if (action == GLFW_RELEASE) {
 		// onMouseUp
@@ -122,6 +123,7 @@ void mouseButtonCallback(GLFWwindow *window, int button, int action, int mods) {
 			gDraggedWidget = NULL;
 			gDragHoveredWidget = NULL;
 		}
+		gTempWidget = NULL;
 	}
 }
 
@@ -214,6 +216,7 @@ void cursorPosCallback(GLFWwindow* window, double xpos, double ypos) {
 			}
 		}
 	}
+	gTempWidget = NULL;
 	if (glfwGetMouseButton(gWindow, GLFW_MOUSE_BUTTON_MIDDLE) == GLFW_PRESS) {
 		// TODO
 		// Define a new global called gScrollWidget, which remembers the widget where middle-click was first pressed