Fixed server waiting times, and other stuff...