Increase timeout for stopping server.
Update TODOs.