Multiple server fixes