Bug fixes as part of vlan interface testing