A few client/server fixes.