Some more fixes on the server side