bugfixes at server