--- a/src/main.c
+++ b/src/main.c
@@ -42,7 +42,7 @@
         (void)setlocale (LC_MESSAGES, "");
     }
 
-    printf ("mcbot-%1.2f\n", VERSION);
+    printf ("mcbot-%1.2f\n", BOT_VERSION);
 
     if ((len = config (&uc, CONFIG_FILE)) != 0) {
         switch (len) {
@@ -84,7 +84,7 @@
 
     if (uc.channel) {
         fprintf (message.stream, "JOIN :%s\r\n", uc.channel);
-        message.current_channel = uc.channel;
+        strncpy (message.current_channel, uc.channel, 40);
         if (uc.topic)
             fprintf (message.stream, "TOPIC %s :%s\r\n", uc.channel, uc.topic);
     }