Small improvements for DiscoveryCommunity