Fix vpc autodiscovery