Improvements to server task.