Minor tweaks to how config is saved