diff --git a/degesch.c b/degesch.c
index ee3e455..4eeea23 100644
--- a/degesch.c
+++ b/degesch.c
@@ -4497,6 +4497,7 @@ irc_get_or_make_user_buffer (struct server *s, const char *nickname)
 	// Open a new buffer for the user
 	buffer = buffer_new (s->ctx->input);
 	buffer->type = BUFFER_PM;
+	// FIXME: this probably needs to be converted to UTF-8
 	buffer->name = xstrdup_printf ("%s.%s", s->name, nickname);
 	buffer->server = s;
 	buffer->user = user;
@@ -6644,6 +6645,7 @@ irc_handle_join (struct server *s, const struct irc_message *msg)
 
 		buffer = buffer_new (s->ctx->input);
 		buffer->type = BUFFER_CHANNEL;
+		// FIXME: this probably needs to be converted to UTF-8
 		buffer->name = xstrdup_printf ("%s.%s", s->name, channel_name);
 		buffer->server = s;
 		buffer->channel = channel =
@@ -6651,6 +6653,7 @@ irc_handle_join (struct server *s, const struct irc_message *msg)
 		str_map_set (&s->irc_buffer_map, channel->name, buffer);
 
 		buffer_add (s->ctx, buffer);
+		// XXX: this is annoying, consider only doing it a while after /join
 		buffer_activate (s->ctx, buffer);
 	}