More improvements to server