Fixed inconsistencies around subnet vs vlan setting.