Many server fixes