mibofra's networking fixes