diff --git a/Makefile b/Makefile
index 9de3e463..5a8acd18 100755
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,6 @@ source:
 	tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude-vcs
 
 install:
-	mkdir -m 755 -p $(DESTDIR)/usr/bin
 	mkdir -m 755 -p $(DEST_APP)
 	mkdir -m 755 -p $(DEST_SHARE)/applications
 	mkdir -m 755 -p $(DEST_APP)/images
@@ -35,7 +34,7 @@ install:
 	install -m 644 src/pyelliptic/*.py $(DEST_APP)/pyelliptic
 	install -m 644 src/socks/*.py $(DEST_APP)/socks
 	install -m 644 src/bitmessageqt/*.py $(DEST_APP)/bitmessageqt
-	install -m 755 debian/pybm $(DESTDIR)/usr/bin/$(APP)
+	install -m 755 debian/pybm /usr/bin/pybitmessage
 
 	install -m 644 desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP).desktop
 	install -m 644 src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png
diff --git a/desktop/pybitmessage.desktop b/desktop/pybitmessage.desktop
index 2b1b6902..363908dd 100644
--- a/desktop/pybitmessage.desktop
+++ b/desktop/pybitmessage.desktop
@@ -7,12 +7,12 @@ Comment=Send encrypted messages to another person or to many subscribers
 Exec=pybitmessage %U
 Icon=pybitmessage
 Terminal=false
-Categories=Network;Email;Application;
-Keywords=Email;E-mail;Newsgroup;Messaging;
+Categories=Network;Email;Application
+Keywords=Email;E-mail;Newsgroup;Messaging
 X-MessagingMenu-UsesChatSection=true
 X-Ubuntu-Gettext-Domain=pybitmessage
 
-Actions=Send;Subscribe;AddressBook;
+Actions=Send;Subscribe;AddressBook
 
 [Desktop Action Send]
 Name=Send
@@ -27,4 +27,4 @@ OnlyShowIn=Unity;
 [Desktop Action AddressBook]
 Name=Address Book
 Exec=pybitmessage -a
-OnlyShowIn=Unity;
+OnlyShowIn=Unity;
\ No newline at end of file
diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index e618b4bd..f9f0950c 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -1143,7 +1143,7 @@ class receiveDataThread(threading.Thread):
                     toAddress = '[Broadcast subscribers]'
                     ripe = ''
                     shared.sqlLock.acquire()
-                    t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastpending',1,1,'sent',2)
+                    t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2)
                     shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''')
                     shared.sqlSubmitQueue.put(t)
                     shared.sqlReturnQueue.get()
@@ -2821,7 +2821,7 @@ class singleWorker(threading.Thread):
 
     def sendBroadcast(self):
         shared.sqlLock.acquire()
-        t = ('broadcastpending',)
+        t = ('broadcastqueued',)
         shared.sqlSubmitQueue.put('''SELECT fromaddress, subject, message, ackdata FROM sent WHERE status=? and folder='sent' ''')
         shared.sqlSubmitQueue.put(t)
         queryreturn = shared.sqlReturnQueue.get()
@@ -2882,7 +2882,7 @@ class singleWorker(threading.Thread):
 
                 #Update the status of the message in the 'sent' table to have a 'broadcastsent' status
                 shared.sqlLock.acquire()
-                t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastpending')
+                t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastqueued')
                 shared.sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?')
                 shared.sqlSubmitQueue.put(t)
                 queryreturn = shared.sqlReturnQueue.get()
@@ -2948,7 +2948,7 @@ class singleWorker(threading.Thread):
 
                 #Update the status of the message in the 'sent' table to have a 'broadcastsent' status
                 shared.sqlLock.acquire()
-                t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastpending')
+                t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastqueued')
                 shared.sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?')
                 shared.sqlSubmitQueue.put(t)
                 queryreturn = shared.sqlReturnQueue.get()
@@ -3813,7 +3813,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             ripe = ''
 
             shared.sqlLock.acquire()
-            t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastpending',1,1,'sent',2)
+            t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2)
             shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''')
             shared.sqlSubmitQueue.put(t)
             shared.sqlReturnQueue.get()
diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index bc971563..6617da3d 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -1129,7 +1129,7 @@ class MyForm(QtGui.QMainWindow):
                 toAddress = self.str_broadcast_subscribers
                 ripe = ''
                 shared.sqlLock.acquire()
-                t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastpending',1,1,'sent',2)
+                t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2)
                 shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''')
                 shared.sqlSubmitQueue.put(t)
                 shared.sqlReturnQueue.get()