Single-server fixes