More improvements to server set up