Various fixes in networking command and script