More networking fixes.