Updates to handle EC2-VPC changes

Some updates to deal with some of the complications added with the
switch to default-vpcs.