Client and server fixes.