various server fixes