More server fixes.