diff --git a/Makefile b/Makefile
index 71661b2..3863c94 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,10 @@ HEADER   := config.inc version.inc log.h bot.h syntax.h
 HEADER   := $(addprefix ${SOURCE.d}, ${HEADER})
 
 ${OUT}: ${SOURCE} ${HEADER}
-	${CC} ${CFLAGS} -o $@ ${SOURCE} ${LDLIBS}
+	./${CC} ${CFLAGS} -o $@ ${SOURCE} ${LDLIBS}
 
 run: ${OUT}
-	${OUT} irc.rizon.net:6665 "#/g/test"
+	./${OUT} irc.rizon.net:6665 "#/g/test"
 
 test: ${OUT}
 	${WRAP} ${OUT} irc.rizon.net:6665 "#/g/test"
diff --git a/source/config.inc b/source/config.inc
index 7331953..a9de7c4 100644
--- a/source/config.inc
+++ b/source/config.inc
@@ -1,6 +1,6 @@
 #ifndef CONFIG_INC
 
-const char * const username                   = "hibot2"; //PROGRAM_NAME;
+const char * const username                   = PROGRAM_NAME;
 const char * const password                   = "";
 const int          message_timeout            = 3;
 const char * const message_queue_full_message = "Air space too crowded in this area.";
diff --git a/source/main.c b/source/main.c
index bf6d31c..c8d1872 100644
--- a/source/main.c
+++ b/source/main.c
@@ -27,7 +27,7 @@ syntax_setter_t syntax_functions[] = {
 
 
 const char help_message[] =
-	PROGRAM_NAME " <server>:<port> <channel>\n"
+	PROGRAM_NAME " <server>:<port> <channel>"
 ;
 
 signed main(int argc, char * * argv) {