Better MOTD handling