Lots of VPC enhancements