server client bugfixes