Fixes in DiscoverVC