RDS and VLAN fixes