More tweaks related to settings.yml