Couple of bugs in the server