some more fixes on the server