Fixes due to VPC usage