Small tweaks for the config