more server fixes