Fixing the server setup