Bugfixes for dedicated server