More tweaks to enable config editing to work