diff --git a/login.banner b/login.banner
index 6ef835f6140f58b73153b3cacd6937437295312c..51ebbc100f15b0b7ee333fa88dd744db3a43c184 100755
--- a/login.banner
+++ b/login.banner
@@ -1,15 +1,15 @@
 
-                  #     #
-###  ###   ##    ##    ##    ##   +------------------------+
- ##  ##         ###   ###         |   on sucs.swan.ac.uk   |
- ### ##          ##    ##         +------------------------+
- ######     #    ##    ##     #   ###   ##   ####    ####  ##   ####
- ######    ##    ##    ##    ##    ##   #   #   ##    ##   #   ##  #
- # # ##   ###    ##    ##   ###    ## # #      ###     ## ##   ###
- #   ##    ##    ##    ##    ##    ## ###    ## ##     ####     ###
- #   ##    ##    ##    ##    ##    ######   ##  ###     ###      ###
- #   ##    ##    ##    ##    ##    ## ##    ## ###       #     #  ##
-### ####  ####  ####  ####  ####   #  #      ## #       #      ####
-                                                      ###
-                                                      ##
+                #    #
+###  ###  ##   ##   ##   ##    +---------------+
+ ##  ##       ###  ###         |  on sucs.org  |
+ ### ##        ##   ##         +---------------+
+ ######    #   ##   ##    #  ###   ##  ####   ####  ##  ####
+ ######   ##   ##   ##   ##   ##   #  #   ##   ##   #  ##  #
+ # # ##  ###   ##   ##  ###   ## # #     ###    ## ##  ###
+ #   ##   ##   ##   ##   ##   ## ###   ## ##    ####    ###
+ #   ##   ##   ##   ##   ##   ######  ##  ###    ###     ###
+ #   ##   ##   ##   ##   ##   ## ##   ## ###      #    #  ##
+### #### #### #### #### ####  #  #     ## #      #     ####
+                                               ###
+                                               ##
 
diff --git a/src/Makefile b/src/Makefile
index de13ff0907c232cef9040fb7e25b1737926a1e76..aeaea91982195d647c7d72d640fdef476b03afd7 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -299,14 +299,17 @@ iconv.o: iconv.c iconv.h
 gagtable.o: gagtable.c gagtable.h
 	$(CC) $(DEFS) $(CFLAGS) -c gagtable.c
 
+
+PACKDIR:=$(shell mktemp -d)
+
 rpm:
-	rm -rf /tmp/mw3-$(VERSION)
-	mkdir /tmp/mw3-$(VERSION)
-	mkdir /tmp/mw3-$(VERSION)/src
-	cp -a *.c *.h *.awk Makefile  /tmp/mw3-$(VERSION)/src/
-	cp -a ../COPYING ../folders.bb ../INSTALL ../LICENSE ../log.bb ../login.banner ../mw.spec ../README ../Makefile ../users.bb ../who.bb /tmp/mw3-$(VERSION)/
-	tar zcvhf /tmp/mw3-$(VERSION)/help.tgz --exclude .svn -C .. colour/ help/ mesgs/ mudhelp/ rooms/ scripthelp/ talkhelp/ web/ wizhelp/
-
-	tar zchvf /tmp/mw3-$(VERSION).tar.gz --exclude .svn -C /tmp/ mw3-$(VERSION)/
-	rpmbuild -tb /tmp/mw3-$(VERSION).tar.gz
-	rm -fr /tmp/mw3-$(VERSION)
+	rm -rf $(PACKDIR)/mw3-$(VERSION)
+	mkdir $(PACKDIR)/mw3-$(VERSION)
+	mkdir $(PACKDIR)/mw3-$(VERSION)/src
+	cp -a *.c *.h *.awk Makefile  $(PACKDIR)/mw3-$(VERSION)/src/
+	cp -a ../COPYING ../folders.bb ../INSTALL ../LICENSE ../log.bb ../login.banner ../mw.spec ../README ../Makefile ../users.bb ../who.bb $(PACKDIR)/mw3-$(VERSION)/
+	tar zcvhf $(PACKDIR)/mw3-$(VERSION)/help.tgz --exclude .svn -C .. colour/ help/ mesgs/ mudhelp/ rooms/ scripthelp/ talkhelp/ web/ wizhelp/
+
+	tar zchvf $(PACKDIR)/mw3-$(VERSION).tar.gz --exclude .svn -C $(PACKDIR)/ mw3-$(VERSION)/
+	rpmbuild -tb $(PACKDIR)/mw3-$(VERSION).tar.gz
+	rm -fr $(PACKDIR)/mw3-$(VERSION)
diff --git a/src/Parse.c b/src/Parse.c
index 5617608561afd8500fe9aec41a0dcf865f5d9137..69cbd1cfaba514d5c0717a4f1d4bfa8ecb3e074c 100644
--- a/src/Parse.c
+++ b/src/Parse.c
@@ -177,8 +177,7 @@ int DoCommand(char *input, CommandList *cm)
 			{
 				if (found==NULL)  /* first one */
 				{
-					found=cm;
-					count=1;
+					found=cm; count=1;
 				}else
 				if (ecount!=1)  /* another, and no exact match */
 				{