Various client/server fixes.