Few fixes in strategy change and discovery.