diff --git a/Makefile b/Makefile
index 50fcd46..fb52343 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,11 @@ clean:
 
 start: deploy
 	# TODO: This doesn't kill weston nicely; I should handle that? Or background or something
-	ssh kiosk "pgrep -f './server' || ./server"
-	#ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so' || true"
+	ssh kiosk "pgrep -f './server' || ./server &"
+	ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so'" || true
 	ssh kiosk weston --shell=kiosk-shell.so -- firefox --kiosk localhost:8000 --remote-debugging-port=9222
 
 debug: deploy
-	ssh kiosk "pgrep -f './server' || ./server"
-	#ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so' || true"
+	ssh kiosk "pgrep -f './server' || ./server &"
+	ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so'" || true
 	ssh -L 6000:localhost:6000 kiosk weston --shell=kiosk-shell.so -- firefox --kiosk localhost:8000 --start-debugger-server 6000