Minor tweaks to configuration and updater

Minor tweaks to configuration and updater.