vnet-related fixes