Lots of VPC and APT enhancements