Fix botched rename in the latest commit and make feature selections in the installer slightly more resilient