diff --git a/Makefile b/Makefile
index c728552..e2466cf 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@
 
 # Install
 install:
-	cp tuved /usr/local/bin
+	cp bin/tuved /usr/local/bin
 .if !exists(/usr/local/etc/tuve)
 	mkdir /usr/local/etc/tuve
 .endif
diff --git a/src/botthread.c b/src/botthread.c
index e4568b6..5e7df48 100644
--- a/src/botthread.c
+++ b/src/botthread.c
@@ -535,7 +535,9 @@
       else if (mysql_num_rows(res) == 0x0) {
         playCnt++;
         mysql_free_result(res);
-        goto getComAgain;
+        // XXX MrOlsen: This is a race condition if there are no commercials, bypassing temporarily
+        // goto getComAgain;
+        goto getRandom;
         }
       else {
         mysql_data_seek(res,(random() % mysql_num_rows(res)));