NetworkWizard improvments
Merge fixes