Initial noEthernetOnly work
Changes asked by Jesse