Single-threaded server fixes.