Multi API server fixes