More client/server fixes