Bugfixes, MOTD support