Made server slightly more sensible