[minor] Logic tweaks to how the Core API is picked up in setup wizard.