Small tweaks to configuration loading