Small networking fixes