Subnet fixes